Merge branch 'eventserver-gui-gen-UPGRADE_TEST' of 192.168.2.6:/repository/eventserver-clone into eventserver-gui-gen-UPGRADE_TEST
