Merge "Make certservice-client use volume mount"