rebase and fix merge conflicts

common/rfb/VNCServerST.cxx

@@ -62,6 +62,7 @@
 #include <rfb/ServerCore.h>
 #include <rfb/VNCServerST.h>
 #include <rfb/VNCSConnectionST.h>
+#include <rfb/Watermark.h>
 #include <rfb/util.h>
 #include <rfb/ledStates.h>
 
@@ -1048,6 +1049,9 @@ void VNCServerST::writeUpdate()
   memset(&jpegstats, 0, sizeof(EncodeManager::codecstats_t));
   memset(&webpstats, 0, sizeof(EncodeManager::codecstats_t));
 
+  if (watermarkData)
+      updateWatermark();
+
   for (ci = clients.begin(); ci != clients.end(); ci = ci_next) {
     ci_next = ci; ci_next++;