rebase and fix merge conflicts

unix/xserver/hw/vnc/vncExtInit.cc

@@ -37,6 +37,7 @@
 #include <rfb/Hostname.h>
 #include <rfb/Region.h>
 #include <rfb/ledStates.h>
+#include <rfb/Watermark.h>
 #include <network/iceip.h>
 #include <network/TcpSocket.h>
 #include <network/UnixSocket.h>
@@ -232,6 +233,9 @@ void vncExtensionInit(void)
           dummyY < 16)
           vncFatalError("Invalid value to %s", Server::maxVideoResolution.getName());
 
+      if (!watermarkInit())
+          vncFatalError("Invalid watermark params");
+
       pipe(wakeuppipe);
       const int flags = fcntl(wakeuppipe[0], F_GETFL, 0);
       fcntl(wakeuppipe[0], F_SETFL, flags | O_NONBLOCK);