"cf push" and  "cf create-service" should not crash with blank for selecting service-plan

[Finishes #48687853]