Adding option to specify server list for find_gear
Fix error message
Merge pull request #3304 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Merge pull request #3315 from jwhonce/bug/986838

Merged by openshift-bot