Made changes to syslog.conf to properly work with PaperTrail without having to change the hostname of the instance
Undid some changes
Merge branch 'fix-syslog-config' into trunk

Conflicts:
	services/cdh/src/main/resources/functions/configure_cdh_hadoop.sh
Merge bracnh fix-syslog-config into trunk