Merge "Fixes server fault thrown by delete password compute rbac test."