Merge branch 'hotfix/3785'

Close #3785
Fixes #3737
Merge branch 'hotfix/3817'

Close #3817
Test fixes for CAPTCHA component

- ZendTest\Captcha\ImageTest::testCaptchaImageCleanupOnlyCaptchaFilesIdentifiedByTheirSuffix
  often fails when running under parallized builds as the test directory
  gets cleaned before we're done. Added a constant to skip the test by
  default.
Merge branch 'hotfix/captcha-failures' into develop

Fixes test issues due to timing issues in captcha GC