[sr-dev] git:master:a129cc1a: Revert "modules/ims_usrloc_scscf: clean up plus some small improvements"