Merge local virtualHosts.xml back in with SLC change Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b Former-commit-id: 20bbd926451ce82c606d80b238c5fbc720164910