[sr-dev] git:master:21d6237a: modules/ims_usrloc_scscf: clean up plus some small improvements