zendframework/zf2#6496 zendframework/zf2#6386 - reverting unrelated test changes
zendframework/zf2#6496 zendframework/zf2#6386 - reverting unrelated test changes

akrabat/zend-validator,Maks3w/zend-validator,zf2timo/zend-validator,zendframework/zend-validator,ezimuel/zend-validator,weierophinney/zend-validator,svycka/zend-validator