Consider upgradable server for site/bench creation

Updated server selection logic to consider server upgradability in addition to health when creating sites and benches.