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
Merge remote-tracking branch 'origin/master' into features/maven-cleanup