Merge "Fix RestbaseVirtualRESTService URL standardization"