Merge "Move the rest of static roles resource registry entries to j2"