Squashed commit of the following:

commit ba7fd984840a0d70737f9de9147d15aa89018fac
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed May 7 14:40:29 2014 -0400

    Fix incorrect graph name

commit bcb6e3aa5c8a01d98bf6343ecfe844644b3c9260
Merge: 83f55c3 07272e2
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed May 7 14:40:02 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into feature-moar-daemon-stats-in-mbeans

commit 83f55c3795ec9743de0d0eb009680d33682d219e
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Tue May 6 15:38:17 2014 -0400

    Finish exposing Trapd stats in MBean
    Add Notifd stats in MBean
    Collection and graph definitions for both