Minor bux fixes and enhancements
Minor bux fixes and enhancements

kkellner/cli-plugin-repo,kkellner/cli-plugin-repo,cloudfoundry-incubator/cli-plugin-repo,guidowb/cli-plugin-repo,kkellner/cli-plugin-repo,guidowb/cli-plugin-repo,guidowb/cli-plugin-repo,cloudfoundry-incubator/cli-plugin-repo,cloudfoundry-incubator/cli-plugin-repo,guidowb/cli-plugin-repo,cloudfoundry-incubator/cli-plugin-repo