[1070326] Do not individually track applications with the same WEB Context
This is an initial commit for consideration.  It enhances discovery in the
as7 plugin such that Deployments automatically process versioned artifact
names.  For example, myapp-1.0.war results in a Deployment resource
of myapp.way with version 1.0.  A subsequent deployment of myapp-2.0.war
results in the existing myapp.war resource being upped to version 2.0.

This is applied to any Deployment based on the SubsystemDiscovery class.

Moreover, general support has been added such that when discovering a new
version of an existing resource, not only is the version updated, but the
resource's plugin configuration is updated with any properties set by the
discovery. In this way if the new version requires updated connection props
(like the EAP address path used to connect) it gets updated.  Since only
those props set by discovery are updated, any existing customizations will be
maintained in the existing configuration.
[1070326] RFE: Allow AS7 deployments to provide version in the artifact name
- Limit the special version-handling to only Deployments or those types that
  "run-inside" Deployments.
- Make the version Pattern configurable.
- Make the regex matching more efficient by using a single Matcher and
  resetting as necessary.
- fix up a mock
[545544] Trivial description fix
Merge branch 'master' into jshaughn/as7-deployment

Conflicts:
	modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java
[614599] add ability to filter by plugin name to AlertCriteria and MeasurementDefinitionCriteria
throwing a bone to an old RFE
[1070326] RFE: Allow AS7 deployments to provide version in the artifact name
Replace the previous approach with a different one.  The previous impl failed
to handle embedded, versioned deployments correctly (like Ear-v1.0 containing
War-2.0).  It also did not properly handle some of the more complicated
DMR addresses.  This new approach does not attempt to replace the existing
discovery, but rather post-processes what is discovered. This separation of
concern should be better and more flexible going forward.
- also updated the plugin descriptor to more fully capture the types that
can be umbrella'd under a Deployment.
[1070326] RFE: Allow AS7 deployments to provide version in the artifact name
- Add ResourceUpgradeFacet support.
- Enhance resourceUpgrade to allow version update
- Enhance resourceUpgrade to allow the plugin code to force upgrade of
  "generic" properties when it knows the upgrade is critical.
[1070326] RFE: Allow AS7 deployments to provide version in the artifact name
- Add ability to disable the new feature and keep versioned artifact names
  by setting sysprope rhq.as7.VersionedSubsystemDiscovery.pattern=disable
- Refactor versioned discovery classes to share some common code.
[1070326] RFE: Allow AS7 deployments to provide version in the artifact name
Some test work:
- update DeploymentTest to deal with a versioned artifact
- add a little null protection
- add a new mock for a new code path
[1070326] RFE: Allow AS7 deployments to provide version in the artifact name
Add some <help> to as7 plugin descriptor describing the new feature.
Merge branch 'master' into jshaughn/as7-deployment