adding SITE_IDENTIFIER to config.
Merge branch 'master' into charter
Config tweaks for charter.