AMBARI-6853 - Alerts: Calculate Hash Based On Alert Definitions (jonathanhurley)
AMBARI-6860 - Alerts: Add Ability to Invalidate Definition Hash For An Agent (jonathanhurley)
AMBARI-6880 - Alerts: Send Definitions Down Via Commands to the Agent (jonathanhurley)
AMBARI-6887. Alerts:  groundwork for alert collection (ncole)
AMBARI-6890 - Alerts: Send Empty Alert Definition With Hash To Agents (jonathanhurley)
AMBARI-6915 - Alerts: Change AlertDefinition to Support a Reporting Member (jonathanhurley)
AMBARI-6924 - Alerts: Updating an AlertDefinition With Partial Property Maps (jonathanhurley)
AMBARI-6942. Alerts: save definitions and send alert data to the server (ncole)
AMBARI-6976 - Alert: Merge Stack Definitions With the Database (jonathanhurley)
Merge branch 'trunk' into branch-alerts-dev

Conflicts:
	ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
	ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
AMBARI-6983. Alerts: persist and allow configuration substitution variables for alert definitions (ncole)
AMBARI-6983. Alerts: persist and allow configuration substitution variables for alert definitions (part 2) (ncole)
AMBARI-6994 - Alerts: Populate Alert Definition Table And Agents (jonathanhurley)
AMBARI-6983. Alerts: persist and allow configuration substitution variables for alert definitions (part 3) (ncole)
Merge branch 'trunk' into branch-alerts-dev
AMBARI-7021 - Alerts: Create Group and Target REST Endpoints (jonathanhurley)
Merge branch 'trunk' into branch-alerts-dev

Conflicts:
	ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
	ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
	ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
	ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
	ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java
AMBARI-7051 - Alerts: Expose Creation and Updating of Group Targets & Definitions (jonathanhurley)
Merge branch 'trunk' into branch-alerts-dev
AMBARI-7094 - Alerts: Implement Property Updates for Alert Targets (jonathanhurley)