Make upstream_hostname match sprout_hostname (fixes #98)
Merge pull request #99 from Metaswitch/iss98

[Reviewer: Andy] Make upstream_hostname match sprout_hostname (fixes #98)
Change Metaswitch submodule refs to ClearwaterCore