CLeanup of mixed mode accessors and field annotations. - Pick one!
Merge branch 'master' of https://github.com/OpenNMS/opennms