Merge "Add service/endpoint discover to verify_tempest_config"