Add missing utility files
Markups
Change Metaswitch submodule refs to ClearwaterCore