Adds missing method introduced in Java 7 to DataSource. Builds on Java 6
and 7 successfully again.
Merge pull request #122 from dschlenk/1.12-java7-fix

Makes sense to me.
Add a second escaped backslash to the last line of the hard coded rrd
graph command template in the MIB compiler so that NRTG works for graphs
generated by the MIB compiler.
Fixes unit test to agree with the new file size
NMS-6918 add method to check node existence when getting node id from event
NMS-6868: add boxWrapper-Div.
NMS-6868: Optimize report templates.
Merge origin/rc/stable/1.14.0 into jira/NMS-6868
Merge remote-tracking branch 'origin/1.12' into rc/stable/1.14.0

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/MonitorTester.java
Squashed commit of the following:

commit c96c38c66ef31de0e64130d4df4930a4bfde726f
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu Oct 2 09:46:58 2014 -0400

    Missed a copyright date

commit 7444f3405b125868e8bb7127246b18ed5a5d7c70
Merge: 6396a82 846caf0
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu Oct 2 09:11:13 2014 -0400

    Merge branch 'rc/stable/1.14.0' of github.com:OpenNMS/opennms into features/tidy-requisitions-list

commit 6396a82582a0de06cab931dd1e49b38ac71c1582
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Oct 1 20:38:18 2014 -0400

    Dumb mistake in my last smoke-test fix

commit 2839cddbde91d560b46e06c3717ab756dc75e226
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Oct 1 15:52:27 2014 -0400

    Another broken Selenium smoke test

commit 2b0fb13b4fac167a0baff40f37ae0609ca4c1748
Merge: 5e5e0dd 5815b84
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Oct 1 15:51:57 2014 -0400

    Merge branch 'rc/stable/1.14.0' of github.com:OpenNMS/opennms into features/tidy-requisitions-list

commit 5e5e0dd5da7e4437119c3bb621dd86f0c004bc42
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Oct 1 10:25:33 2014 -0400

    Fix touchy smoke test, update copyright date

commit 43ec5e1d2782165f3b5aaeb3efa54ca7b1aeef40
Merge: 2e5dbfe 5e2068f
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Oct 1 10:21:26 2014 -0400

    Merge branch 'rc/stable/1.14.0' of github.com:OpenNMS/opennms into features/tidy-requisitions-list

commit 2e5dbfed7a2e3544e33b25513abfeb71d7b9e366
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Tue Sep 30 16:07:56 2014 -0400

    Twitch. Nodes, not node.

commit daf30f437d9003f9886779a4b30ef1a3c55002e7
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Tue Sep 30 16:04:01 2014 -0400

    - All the things in the requisitions list page that should be
      buttons are now buttons
    - No longer will we clobber an existing requisition when a user
      accidentally tries to create it from the web UI
Fix for NMS-6923: CDP "Node Link" jsp
Merge branch 'rc/stable/1.14.0' of github.com:OpenNMS/opennms into 1.14.0
return null
Merge branch 'jira/NMS-6918' into rc/stable/1.14.0
Merge pull request #126 from OpenNMS/jira/NMS-6868

jira/NMS-6868 merged. Verified SNMP Interface Availability report works when relevant data is present.
[bamboo] Automated branch merge (from rc/stable/1.14.0:76b59d9b44e6e6182f836baf5f59859a29e24fb1)