Merge "Stop using SiteConfiguration::isLocalVHost()"