fix to conditional asserts
Merge branch '1.6' of github.com:Codeception/Codeception into 1.6