Merge branch 'hotfix/3162' into develop

Forward port #3162
Merge branch 'alex347-master' into develop
Merge branch 'hotfix/3254' into develop
Forward port #3254
Merge branch 'hotfix/mysqli-cs-cleanup' into develop

Fix travis failures
Merge branch 'release/2.0.6' into develop

Merged in changes for 2.0.6 release (changelog, mainly)

Conflicts:
	library/Zend/Version/Version.php
support nested error handler
Added one-liner rendering for full forms
File upload rename filter rewrite; Misc cleanup of File/Rename filter
CS fixes
Adding failing test demonstrating that the helper does not call 'prepare'
Fixing test introduced in @0b89787
Allows several translation files for same domain / locale
invoke fix
Fixed an error of indentation
Adapt to coding Standards
DateElement now support a string
fixed a typo on classname
added tests
proper solution of handling exceptions in tests
Fixed CS issues