Merge "Fix warnings for BufferHubServer_test in oc branch"