Code review feedback
Change Metaswitch submodule refs to ClearwaterCore