Pr 1192 rebase + reformat#1216

pivotal-david-osullivan merged 2 commits into

cloudfoundry:maincloudfoundry/cf-java-client:mainfrom

anthonydahanne:pr-1192anthonydahanne/cf-java-client:pr-1192Copy head branch name to clipboard