Merge "RestbaseVirtualRESTService: Support production URL layout"