Merge "Fix tempest-account-generator command roles issue"