Merge serathius:http_auth_only_from_environment_variables