Merge "Add exception handling to delete schema set when a registration is removed"