Fixes maintainer email, config and log directories, service creation and executable scripts
Resolve merge conflicts
re-set submodule
Fixed version of jnrpe-debiam
Changed the control file