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
Merge remote-tracking branch 'origin/master' into feature-snmp4j2-upgrade