Bug 1034218 - EAR subdeployments are not discovered for DomainDeployment

Added missing line: a subdeployent can be a child of a ManagedServer deployment

(cherry picked from commit d327d3ffccfdde166a746f42b542150fdd70d984)
Signed-off-by: Jirka Kremser <jkremser@redhat.com>
[BZ 1005922] - Selecting grouped fired alerts in chosen time range does not work - When switching grouping on, the values of the range filter are stored and the filter is reset in order to fetch all the data (when grouping is on, no filtering can be applied). Similarly, when switching it off, the values are loaded from previously saved filter and applied as start/end date for filtering of alerts.

(cherry picked from commit 85e1e11584d9d0327e9435624abcc38110d6bd6d)
Signed-off-by: Mike Thompson <mithomps@redhat.com>

Conflicts:
	modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/storage/StorageNodeAlertHistoryView.java
 Increment apache commons fileupload to 1.3.1.