Merge "Fix PutHttpPassword to allow all intended use cases"