Bug 846362 - [jboss-as5] Shutdown max wait time "shared" between different resources
Bug 956329 - Create new Managed Server using EAP 6 plug-in exposes server groups and socket binding groups from other resources

Introduced new expressionScope attribute in RHQ config XSD for option source node (updated config parser, PropertyOptionSource entity and database schema accordingly)

Updated ConfigurationGWTService and ConfigurationManagerBean: now when filling enumeratedValues we look at expressionScope attribute to narrow down search results if expressionScope is 'baseResource'

Updated as7 plugin to use new expressionScope attribute for Managed Server resource configuration attributes
remove entries for stuff still in a branch
Alert view for a single storage node and its child resources.
fix for BZ: 707349 from e7d48240474fba87f1a3c4118de4618fd2c8b32d.

Conflicts:

	modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java
	modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java
	modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
Fix BZ 865460 from 417fbb59817edf64a93d3cca00f2c51926379ab2

Conflicts:

	modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java
[BZ 921194] Connectors are not properly discovered and therefore are unavailable.. from 00e594847fe67da46f8976df58b5d2324d6ebb48.
[BZ 921261]  WebModule is reported as DOWN or UNAVAILABLE ... from 00e594847fe67da46f8976df58b5d2324d6ebb48
[BZ 921261]  WebModule is reported as DOWN or UNAVAILABLE ... from da0179ab26a0c3e3a50238e9997147864e5a759b
[BZ 921194] Additional corrections by lfuka.
[BZ 865460] Cannot add a Group to tomcat's UserDatabase
Add GraphMarker interface to mark places in the code where graphs are (later) injected by d3 javascript code.
[BZ 991598] Add basica node configuration validation to the composite class. It validates heap settings as well as port settings.
More text for the schema compatibility text.
Fixing errors after rebase merge.
Add alert template for maintenance operation failures for storage nodes.
refactoring state transitions and adding method for deployment

When a storage node is committed into inventory its operation mode is set to
INSTALLED, unless the storage node entity exists in which case the mode is set
to NORMAL. After creating the storage node entity, deployment is started. The
operation mode changs to ANNOUNCE. The address of the new node is announced to
existing cluster nodes. After announcing completes, the operation mode changes
to BOOTSTRAP, and the prepareForBootstrap operation is run on the new node.
When the new node is reported up as part of the cluster, the operation mode of
all cluster modes is set to ADD_NODE_MAINTENANCE. The addNodeMaintenance
operation is then run on each storage node. When that operation completes, the
node's operation mode is set back to NORMAL.

The StorageNodeManagerBean.deployStorageNode method looks at the operation mode
of the node to determine at what step in the process to start the deployment.
The deployStorageNode method is the only method that the UI or remote API will
need to invoke to start or resume a deployment.
add fields in StorageNode for error reporting during maintenance

Storage node deployment and undeployment consists of a series of different
resource operations. The (un)deployment work flow could fail due to one of
those resource operations. When that occurs we can provide a direct link in the
StorageNode.failedOperation field to the operation history of the failed
operation. This direct link will help with providing quick insight into the
cause of the failure.

There is also a new errorMessage field in StorageNode. This field will provide
summary info about the failure.  If the failure is in server side processing
and not in a resource operation, then the errorMessage field should be set but
not the failedOperation field.
capture and log deployment failures that result from failed resource operations
adding more error handling for storage node deployments

In my previous commit I added code to persist resource operation failures that
occur during storage node deployment. This commit adds error handling for
unexpected server side errors. Errors are logged to the StorageNode entity in
a separate transaction to ensure that the error message gets persisted.