No practical change, but adds the "cherry-picked from" to aid tracking. This has also been queued for stable so will eventually show up in a 4.4.x and can be dropped from here. Signed-off-by: Ian Campbell <ian.campbell@docker.com>