Merge "Fix service list in verify_tempest_config"