Merge "VirtualRESTServiceClient management cleanups"