fix 'Possible precedence issue with control flow operator' warning bnc#901597
Merge pull request #29 from noelpower/bnc901597_SLE12

fix 'Possible precedence issue with control flow operator' warning bnc#9...
Merge remote-tracking branch 'upstream/SLE-12-GA'
Merge pull request #30 from noelpower/master

backport fix for bnc#901597 to SLE12-GA and then merge branch back