Fix the issues on tempest_account_config

Earlier missed to push some changes made in local branch, which caused tempest
build fail. Pushing them.