This reverts commit d30bf4a19f. This also includes the get_buildservice_env_name method in Defaults to centralize '.buildenv' occurrences.
d30bf4a19f