Try to dup code and remove poller references to capsd.  Update features
to get further deployment.
Remove erroneous feature (eventd) from capsd
Merge branch 'working'
Merge branch 'master' of https://github.com/savoirtech/opennms-ng
Conflict merge