Merge "Fix resetting user password in keystoneng" into release/2019.2.0