Removed transaction manager and aop proxy ref
NMS-6102: changed the DataLinkInterfaceDao

The findByNodeidAndIfIndex will return now a list of links
This is needed because it can happen that different links are
found on the same nodeid/ifindex.
All the test passes successfully
Favorites for Filters work now (only for Events)
Revert "Removed transaction manager and aop proxy ref"

This reverts commit 77babf8c0a80c70e5c427e2928b43f1e0ef89eb9.
Reverted JUnit back to 4.10 because 4.11 had strange test-reordering issues.
Lint cleanup (array style, unnecessary locals, and string concatenation).
Merge branch 'master' into soleger-master
Merge branch 'master' into features/TS
Fixes NMS-6113 / Cron-triggered reports in Reportd do not work
Stop wrapping the report parameters in an UnmodifiableMap, since
JasperReports is later going to try to put() into what we return.
Fixed double assertEquals() calls.
Added Favorites to Alarms. Also added javadoc
Added workaround to allow the DAOs to save data.
NMS-6073 allow larger provisioning web forms
Release Notes for Release 1.10.13
1.10.13-SNAPSHOT -> 1.10.13
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	debian/changelog
Added alarmidnotfound.jsp back to the UI since it was mistakenly deleted
in commit 2986ff4be0ed0a30fa1f9453d0d028e13eefcc0c. Fixes bug NMS-6114.
Merge branch '1.12' of https://github.com/OpenNMS/opennms into 1.12
Added alarmidnotfound.jsp back to the UI since it was mistakenly deleted
in commit 2986ff4be0ed0a30fa1f9453d0d028e13eefcc0c. Fixes bug NMS-6114.
bump selenium version, use phantomjs if it is found

Conflicts:
	smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java