us #2057: fixed issues with cloud foundry cli..

Change-Id: Ic9fd584d9cfd49c0a849f4596480c3607c95bb50