added new automation properties, integrated headpin with deltacloud
Merge branch 'master' of github.com:hhovsepy/katello-api

Conflicts:
	katello-automation.properties
	src/com/redhat/qe/katello/common/KatelloUtils.java