Merge Latest OpenNMS Master to JunosSpace Master

I've gone ahead and fixed merge/compilation issues with the latest OpenNMS master and your master branch.  If you do this pull from the OpenNMS "space-integration" branch, you should get all of our latest changes as well as RPMs that build again.