Merge "Move flavor client in cls.setup_compute_client()"