Attempt to mimic changes from upstream PR#27467#212

rhatdan merged 1 commit intoprojectatomic:docker-1.12.3projectatomic/docker:docker-1.12.3from

nalind:docker-1.12.3-attachnalind/docker:docker-1.12.3-attachCopy head branch name to clipboard