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

Why the switch to an extra method call? I sort of like the check being the variable we set to true inside the block