Merge "Restore VVM config for Orange France" into nyc-mr1-dev