[DO_NOT_MERGE] [origin-ui-180] rhc support for multiple servers

Make sure this is appropriately protected for commands with no switches, etc...