Merge "Replace 2 synchronized blocks with one in revokeUserAdmin method"