Quote ;transport=TCP correctly
Merge branch 'iss132' into dev
Change Metaswitch submodule refs to ClearwaterCore