cleanup and merge dnets
Merge branch 'master' of https://github.com/equalitie/devopsjs

Conflicts:
	src/node/nrpeCheck.js