missed these merge conflicts when manually rebasing too many files

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Merge pull request #6825 from SvenDowideit/fix-man-page-merge-mess

missed these merge conflicts when manually rebasing too many files
Bump version to v1.1.0

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)