More bootstrapification.
Merge branch 'features/bootstrap' of github.com:OpenNMS/opennms into features/bootstrap