Merge "Fix verify_tempest_config with disabled services"