mosart1.1.13: Refactor conditional to work with ifx, which doesn't short-circuit#126

ekluzek merged 3 commits into

ESCOMP:masterESCOMP/MOSART:masterfrom

billsacks:fixes_for_ifxbillsacks/mosart:fixes_for_ifxCopy head branch name to clipboard