New changes to include OR expressions in guards and conditional statements.
Merge branch 'alrd' of https://github.com/symphonytool/symphony into acf
Changes requested by fault tolerance plugin.