merge fixes
fix failed merge
 FUEL-682 Added syslog logging to Horizon and MySQL/Galera