Merge "remove code duplication in tempest/config.py"