This reverts commit dca01c5e.
Bungled commit message; missed "#" prefixing issue ID.

Fixes: Warning: array_flip(): Can only flip STRING and INTEGER values! in
DrupalDefaultEntityController->load() (line 17 5 of
/var/aegir/hostmaster-7.x-3.x/includes/entity.inc).

Issue #2712701 by colan: Provide select options for the SaaS platform instead of requiring a node ID.

Merge branch 'hosting_saas_utils_merge' of git.drupal.org:project/hosting_services into hosting_saas_utils_merge

Issue #2705805 by colan: Split SaaS config into Basic settings, Client handovers, and Injected variables.

Issue #2712701 by colan, gboudrias: Request the template site name instead of the node ID in the SaaS settings.