Merge "Fix grammar in UserPasswordPolicy documentation"