Reinstate hostheader
Merge pull request #9 from Metaswitch/iss6

[No reviewer] Reinstate hostheader
Change Metaswitch submodule refs to ClearwaterCore