[plugin:Watermark] fix volume driver options plugin-Watermark-source
Merge branch '2.1' into 2.1_n