Merge "Fix creating non-parameterized hashes in ParameterizedPassword"