Merge "Bug 4957 Fix RoleChangeLifecyle (init, close, life)"