Setup and config changes needed to run integration tests on nodechecker.py
Merge branch 'master' of https://github.com/open-infinity/health-monitoring

Conflicts:
	nodechecker/nodechecker/lib/python/nodechecker/notification/mailer.py