Update buildServerSet to handle image/flavor names/IDs and build timeouts