Merge branch 'kpieters-hotfix/ZF2-536' into develop
Pull Request #2325
Merge branch 'kpieters-unittestSql' into develop
Merge branch 'security/escaper-usage' into develop

Forward port from master.

Fixes a number of components that were not using Zend\Escaper to escape HTML,
HTML attributes, and/or URLs.
Merge branch 'hotfix/cs' into develop

Fixes failing php-cs-fixer notices
Merge branch 'hotfix/cs' into develop

Forward port EOF changes
Merge branch 'hotfix/2400' into develop

Forward port #2400
Merge branch 'hotfix/zf2-533' into develop

Forward port #2383
Merge branch 'hotfix/zf2-558' into develop

Forward port #2393
Merge branch 'hotfix/2398' into develop

Forward port #2398
Merge branch 'hotfix/zf2-572' into develop

Forward port #2401
Merge branch 'hotfix/feed-tests' into develop

Conflicts:
	library/Zend/Version/Version.php
	tests/ZendTest/Feed/Writer/FeedTest.php
Merge branch 'hotfix/2406' into develop

Forward port #2406
Allow to specify custom pattern
DateSelect can extract from DateTime
Add new validator to check if input is instance of a certain class

Change-Id: I6365cf9a6652ca42a1f6897002e5abe455ed4f44
Fix prepareindex counter
- Removed empty line
- Removed call to setClassName() in constructor so it uses the parent
constructor (and setOptions()) to set the options

Change-Id: I0720d0543b0a6918b7e8a0817d353aff668f5517
Take advantage of PluralRule
Allow to render template separately
Does not take into account locale