Fix up user deletion
Change Metaswitch submodule refs to ClearwaterCore