lots of camel cleanup, and other stuff.
Merge branch 'master' of https://github.com/afspear/monitoring