OUTPUT file type set even if in mon directory (mini-merge output)
* implemented hltd log collection
* herod is propagated from BU, initiates shutdown of all runs with signal 9 and
 waiting for (an)elastic scripts to end properly. new state file added: abortcomplete
Merge branch 'master' of ssh://github.com/cmsdaq/hltd

Conflicts:
	python/hltd.py
added openjdk rpm dependency to metarpm
updating switch to /opt/fff in setupmachine script