[sr-dev] git:master: modules/ims_usrloc_scsc, modules/ims_registrar_scscf: overhaul of contact storage, more efficient and clean