Merge branch 'hotfix/captcha-failures'

Fixes test failures due to timing issues in captcha GC
Zend\Db\Sql\Predicate\Predicate
Fixes #3832 - ensures literal() is backwards compatible when non-null testing values are passed as 2nd parameter
Merge branch 'hotfix/3836' into develop

Forward port #3836