Ensure we have free gears available
Merge pull request #603 from liggitt/fix_scalable_test

Merged by openshift-bot
[origin-ui-180] rhc supporting multiple servers
[origin-ui-180] Removing discard_global_option
[origin-ui-180] rhc server feature tests
[origin-ui-180] Bug fixes and improvements according to code review
[origin-ui-180] Moved more configs to servers.yml, added server nickname suggestions