Merge "Remove duplicate Iscsid service in resource registry"