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

Does this mean we are not throwing an error on update when we don't find the server?