Merge "Get domain_id instead of name for user_create call" into release/2019.2.0