Fix NMS-6580: Security: downloadReport allow download and view any file in filesystem
Restrict to files in the Reportd storage directory (default OPENNMS_HOME/share/reports)
Clean up imports
Fix NMS-6580: Security: downloadReport allow download and view any file in filesystem
Restrict to files in the Reportd storage directory (default OPENNMS_HOME/share/reports)

Conflicts:
	opennms-webapp/src/main/java/org/opennms/web/controller/DownloadReportController.java
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-webapp/src/main/java/org/opennms/web/controller/DownloadReportController.java
handle optional build version
Merge remote branch 'origin/1.12'
use features-maven-plugin 1.1.0
merge fix
Merge branch 'master' of git://github.com/OpenNMS/opennms
Fix up DownloadReportController following post-merge breakage
Merge branch 'master' of github.com:OpenNMS/opennms

Conflicts:
	opennms-webapp/src/main/java/org/opennms/web/controller/DownloadReportController.java
newer features maven plugin fixes this!
Merge branch 'master' of github.com:OpenNMS/opennms
Fix for issue with missing property settings in magic-users.properties. It now logs the error rather than throwing an exception and not allowing the user to access OpenNMS web ui
allow larger addresses in the path outage table
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
Minor tweak to log message to make the result of the improper configuration of magic-users.properties clear
Release Notes for Release 1.10.14
1.10.14-SNAPSHOT -> 1.10.14
1.10.14 -> 1.10.15-SNAPSHOT