Merge branch 'cli_user_can_provide_tags' of https://github.com/cloudf…

…oundry/cli into cli_user_can_provide_tags

Conflicts:
	cf/i18n/resources/en_US.all.json
	cf/i18n/resources/es_ES.all.json
	cf/i18n/resources/fr_FR.all.json
	cf/i18n/resources/it_IT.all.json
	cf/i18n/resources/ja_JA.all.json
	cf/i18n/resources/pt_BR.all.json
	cf/i18n/resources/zh_Hans.all.json
	cf/i18n/resources/zh_Hant.all.json