Merge "Add ability to set custom keystone user names" into release/2019.2.0