Merge "tempest: Make _create_router_with_client obey enable_snat=False"