Merge pull request #474 from brenton/BZ1154471

Bug 1154471 - React to RHEL 6.6 shipping rsyslog7
fix missing "then" in conditional
Merge pull request #475 from dobbymoodge/openshiftksfix

fix missing "then" in conditional
Bug 1156268 - rsyslog7-7.4.10-3.el6_6.x86_64 fails for libjson-c.so.2 missing