PM-731  the path to the credential is based on site name.
PM-731

The environment names cannot have a - in them. All - in sitename are
replaced with _ when determing what environment variable to construct.
Merge branch 'PM-731'