Fix docker_compose up_args#997

mcarrolle wants to merge 3 commits intopuppetlabs:mainpuppetlabs/puppetlabs-docker:mainfrom

mcarrolle:fix-compose-upargsmcarrolle/puppetlabs-docker:fix-compose-upargsCopy head branch name to clipboard