* initial commit to split tenant group metadata * attempt to fix merge errors * fix compile errors and adjust existing tests * fix infinite loop and extra ACTOR tag * direct assignment instead of store * direct assign instead of store (missed a few)