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

Fixed