CIVICRM_SITE_KEY is now configured from the Bluebird config file.  The smtpPassword was not being set correctly when running manageCiviConfig because the site key was not defined.  Fixes #6966.
Merge branch 'dev' into test
Merge branch 'test' into prod