Merge "Make sure the ROLE_HOME is always set in RoleManager"