AMBARI-6876. Flume: stopping agent doesn't work on host with multiple agents (ncole)
AMBARI-6881 - Remove alerts.json from trunk (jonathanhurley)