gofmt does not result in the same thing as go fmt -s file.go, which is what travis tests for

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Replace 'private' with 'self-hosted' in a couple of places

Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Return devmapper errors with additional text
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Merge pull request #6069 from crosbymichael/dm-errors

Return devmapper errors with additional text
Merge pull request #6068 from jpetazzo/update-wording-private-self-hosted-registries

Replace 'private' with 'self-hosted' in a couple of places
Use Timeout Conn wrapper to set read deadline for downloading layer

Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org> (github: crquan)
Remove collections package

It doesn't needed anymore аfter port and ip allocators refactoring
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4dmath@gmail.com> (github: LK4D4)
Merge pull request #5957 from cgwalters/manpage-typo

docker-run.1: Fix typo 'priviledged'
Add system.SetKeepCaps and system.ClearKeepCaps

Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
SETUID/SETGID not required for changing user

It is no longer necessary to pass "SETUID" or "SETGID" capabilities to
the container when a "user" is specified in the config.

Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
Change 'Uploading context' wording

Docker-DCO-1.1-Signed-off-by: Ryan Stelly <ryan.stelly@live.com> (github: FLGMwt)
Fixes #5749
libcontainer support for arbitrary route table entries

Docker-DCO-1.1-Signed-off-by: William Thurston <me@williamthurston.com> (github: jhspaybar)
Merge pull request #5868 from jhspaybar/5749-libcontainerroutes

libcontainer support for arbitrary route table entries
Merge pull request #6076 from LK4D4/remove_collections_package

Remove collections package
Revert "Remove the bind mount for dev/console which override the mknod/label"

This reverts commit ae85dd54582e94d36b146ab1688844ed58cc8df3.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
libcontainer: Don't create a device node on /dev/console to bind mount on

There is no need for this, the device node by itself doesn't work, since
its not on a devpts fs, and we can just a regular file to bind mount over.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
add support for COPY to docker build

This adds a COPY command to docker build which works like ADD, but is
only for local files and it doesn't extract files.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Merge pull request #6090 from alexlarsson/fix-console

Fix /dev/console
Merge pull request #6067 from SvenDowideit/go-fmt-s

gofmt does not result in the same thing as go fmt -s, which is what travis uses
Merge pull request #5402 from SvenDowideit/dont-update-authors

Don't add yourself to the AUTHORs file - its generated