Fixed a few incorrect titles and added more graph entries
Merge branch '1.12' of https://github.com/rdkgit/opennms into 1.12
Updated xmp graph titles and added more graphs
Updated xmp configs to more useful defaults.
Fix for enhancement NMS-5884
Merge remote-tracking branch 'origin/1.10' into 1.12
Fixed includes install.share.dir variable rather than hardcoding location
Merge pull request #12 from rdkgit/1.12

Taking in Bobby's updated graph definitions and other XMP-related improvements for 1.12.
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
Changed caption on deselection link to address bug SPC-567.
Fix for issue SPC-592
JsmiMibParser was not dropping a trailing .0 from the id mask-element
of non-standard trap types per RFC3584 sec 3.2 section 1 bullet 1
sub-bullet 2 (whew), resulting in event masks that failed to match
incoming traps.
Merge branch '1.12'
Fix NMS-5886: Distributed map popup unknown map implementation on new install
Fix of #SPC-480
Fix of alarm page: Clear of Memos did not work anymore
Added ability to perform additional Comparator-based sorting inside the
OnmsDaoContainer so that we can sort on properties that are @Transient
and cannot easily be sorted in the database with Hibernate. Addresses
bug SPC-579.
Work around JAXB/JDK7 issue http://bamboo.internal.opennms.com:8085/browse/OPENNMS-MASTER17-TEST-89
Merge branch '1.12'
forgot to add this for the previous fix
Merge branch '1.12'