[IZPACK-1194] "contains" condition does not work for checking plain <variable> values (post-fix with clean-up, no functional bug, just code involved twice)
Merge pull request #297 from rkrell/master

[IZPACK-1194] "contains" condition does not work for checking plain <variable> values (post-fix)