fix wording
better wording
Merge remote-tracking branch 'origin/1.10'
Squashed commit of the following:

commit 5e9579b3d2c82958a33402f0d07fa0b7e0d19af2
Author: Seth Leger <seth@opennms.org>
Date:   Thu Jun 7 09:43:09 2012 -0400

    Fixed package names in reporting DAO pom.xml.

commit d01a3416dcdc6f1febd90e9cc486f64d663f45c1
Author: Seth Leger <seth@opennms.org>
Date:   Thu Jun 7 00:41:36 2012 -0400

    Changed several integrations projects into OSGi bundles. Made the
    Export-Package directives more precise for opennms-config.

commit 26042ba54b7a85deb96a04ceea87892793631361
Author: Seth Leger <seth@opennms.org>
Date:   Tue Jun 5 23:00:59 2012 -0400

    Added bundle plugin configs to more projects.

commit 0f8587f9b7097cf28c7166ba0ce484342d39a474
Author: Seth Leger <seth@opennms.org>
Date:   Tue Jun 5 11:28:05 2012 -0400

    Added bundle plugin configs for several projects. Cleaned up dependency
    scopes in several POMs.

commit a7530a0b0757f66f1939dd9032db3523d70d5607
Author: Seth Leger <seth@opennms.org>
Date:   Tue Jun 5 10:48:54 2012 -0400

    Cleaned up Bundle-SymbolicName values so they look like OSGi bundle
    names. Added bundle plugin calls for a couple of projects.

commit 54bff31bdf5993f1e3f0708ec0b63b761c499a3d
Author: Seth Leger <seth@opennms.org>
Date:   Fri Jun 1 13:04:17 2012 -0400

    Cleaned up more bundle manifests so that the packages are in order from
    most specific to least specific. Minor package refactoring of web unit
    tests.

commit 0cd72da717583330084c7d26639734c367dc5daf
Author: Seth Leger <seth@opennms.org>
Date:   Thu May 31 15:51:05 2012 -0400

    Added simple DiscoveryIntegrationTest and made ping class dependencies
    more accurate in core/daemon and opennms-services.

commit 86c8a079f4e037a35a7cdcc174e7927019ed10b1
Author: Seth Leger <seth@opennms.org>
Date:   Thu May 31 15:16:27 2012 -0400

    Fixed beanRefContext.xml so that only one daemonContext is declared.
    This will prevent the startup failures that we've seen since the
    renaming of the opennms-daemon project to core/daemon.

commit 163c1bb1e4ae796f2265def7faccd283e756bc03
Author: Seth Leger <seth@opennms.org>
Date:   Wed May 30 15:46:27 2012 -0400

    Moved classes out of the generic org.opennms.web package and into more
    specific packages.

commit aa75d7792da6d93dfc70259ed833c1dac4321171
Author: Seth Leger <seth@opennms.org>
Date:   Wed May 30 12:01:50 2012 -0400

    Changed artifactId of mock-snmp-agent.

commit e22ccf5547269e86431a3b7a722086d393e7ac12
Author: Seth Leger <seth@opennms.org>
Date:   Wed May 30 12:01:08 2012 -0400

    Removed incorrect abstract qualifier from DBUtils.

commit 47784225e374cae2529352c791a371e6d8980b43
Author: Seth Leger <seth@opennms.org>
Date:   Wed May 30 10:40:48 2012 -0400

    Refactored some web classes into more appropriate packages.

commit fe5c633908425cfe3fa9d1c83e00986bc5a744d7
Author: Seth Leger <seth@opennms.org>
Date:   Wed May 30 10:40:14 2012 -0400

    Removed unnecessary sleep() from unit test.

commit 3a14c69df361ba189ccbf4791c43d32c4d73c2b5
Author: Seth Leger <seth@opennms.org>
Date:   Wed May 30 10:38:57 2012 -0400

    Changed all Utils classes to be abstract since they only contain static
    methods.

commit 7df274a9e2cd264b9c5a390649f6e253f4e9fb30
Author: Seth Leger <seth@opennms.org>
Date:   Wed May 30 10:34:45 2012 -0400

    Removed unused AssertUtils class.

commit 4cdf7309d797d379c76579b45b501716d5306a54
Author: Seth Leger <seth@opennms.org>
Date:   Wed May 30 10:33:15 2012 -0400

    Removed DaemonUtils class since it was just a thin wrapper for
    InetAddressUtils.
Changed unit test to reset the default locale after it is finished so it
doesn't poison further unit tests.
Merge feature alarm-notes to master
Added missing alarm/detail.jsp missed from merge from feature-alarm-notes into master
Fixed import for XssRequestWrapper. Package was moved.
Fixed import for WebSecurityUtils. Package is moved.
Merge remote-tracking branch 'origin/1.10'
More s/Group/Requisition/ changes in requisitions editor UI
Fixed captions in smoke tests to match the new values from Jeff's
latest changes in commit a2dd17b0598d8d234f817b942f7033cc8639e318.
Added icons for sticky and journal memo from http://openiconlibrary.sourceforge.net. Improved layout for alarm detail page for sticky and journal memos. Centralized icons on alarm list page, split textareas in alarm detail page.
Changed the refresh header from alarm/detail.htm from 30 to 300 seconds. It gives you more time to create memos for an alarm. For further details read: http://www.opennms.org/wiki/Featurebranch/feature-alarm-notes
Fix for Bug NMS-5400
Merge remote-tracking branch 'origin/1.10'
Removed JUnitSnmpAgent that is binding to localhost which is probably
causing intermittent failures in the unit tests.
Removed JUnitSnmpAgent that is binding to localhost which is probably
causing intermittent failures in the unit tests.
Added an OSGi blueprint mapping for the servlet inside
core/test-api/http so that it can be used for OSGi integration testing.
Merge branch 'master' into opennms-package-cleanup