Correct iFC
Further corrections to the iFCs
Change Metaswitch submodule refs to ClearwaterCore