zmonitor addition
Merge pull request #281 from claws/zmonitor_addition

zmonitor addition
Code cleanups
Merge pull request #282 from hintjens/master

Code cleanups
fixing merge conflict between auto generated files concerning zmonitor and zproxy additions