Merge "Removal of re-switching of rbac-role from tearDown"