Revert changes from OPENNMS_1_2_BRANCH that I had also applied to HEAD.  These will wait until we do the massive 1.2 -> HEAD update so we don't have problems with conflicts
Revert changes from OPENNMS_1_2_BRANCH that I had also applied to HEAD.  These will wait until we do the massive 1.2 -> HEAD update so we don't have problems with conflicts


rdkgit/opennms,tdefilip/opennms,rdkgit/opennms,tdefilip/opennms,roskens/opennms-pre-github,rdkgit/opennms,rdkgit/opennms,rdkgit/opennms,rdkgit/opennms,aihua/opennms,roskens/opennms-pre-github,roskens/opennms-pre-github,roskens/opennms-pre-github,aihua/opennms,tdefilip/opennms,tdefilip/opennms,aihua/opennms,tdefilip/opennms,roskens/opennms-pre-github,roskens/opennms-pre-github,aihua/opennms,rdkgit/opennms,aihua/opennms,roskens/opennms-pre-github,roskens/opennms-pre-github,roskens/opennms-pre-github,rdkgit/opennms,aihua/opennms,aihua/opennms,aihua/opennms,aihua/opennms,roskens/opennms-pre-github,tdefilip/opennms,roskens/opennms-pre-github,tdefilip/opennms,rdkgit/opennms,rdkgit/opennms,tdefilip/opennms,tdefilip/opennms