[#5364] Added note on feature to release notes
Merge branch 'feature/5364' into develop

Close #5364
Merge pull request #5365 from texdc/Add_Guard_Traits

[stdlib] Add guard utils and traits
[#5364] Incorporate feedback
[#5364] CS fixes

- Updated copyright year
- Removed unneeded annotations
- Removed empty lines at start and finish of classes
Merge branch 'feature/5364' into develop

Close #5364
Merge branch 'hotfix/5425' into develop

Forward port #5425
Merge PR #5486
Merge branch 'hotfix/db-sql-move-where-to-PredicateSet' of git://github.com/turrsis/zf2 into turrsis-hotfix/db-sql-move-where-to-PredicateSet

* 'hotfix/db-sql-move-where-to-PredicateSet' of git://github.com/turrsis/zf2:
  revert
  fix Having and tests added code simplification partially BC fixes
  move Delete::where, Select::where, Select::having, Update::where functionality to Sql\Predicate::addPredicates
Merge pull request #5469 from snapshotpl/console-controller

Abstract console controller
[#5469] Added note to README changelog
Merge branch 'feature/5469' into develop

Close #5469
PR #5486
s/$predicates/$predicate/ in addPredicates()
Moved test functionality to PredicateSetTest
Merge PR #5486 to develop
Merge branch 'turrsis-hotfix/db-sql-move-where-to-PredicateSet' into develop

* turrsis-hotfix/db-sql-move-where-to-PredicateSet:
  PR #5486 s/$predicates/$predicate/ in addPredicates() Moved test functionality to PredicateSetTest
  revert
  fix Having and tests added code simplification partially BC fixes
  move Delete::where, Select::where, Select::having, Update::where functionality to Sql\Predicate::addPredicates
Merge remote-tracking branch 'upstream/develop' into develop
Fixed bug that didn't allow the Sqlsrv PDO driver to be set properly for the Platform\SqlServer object
Forward port #5672

Conflicts:
	library/Zend/EventManager/EventManagerAwareTrait.php
	library/Zend/Form/View/Helper/FormRow.php
	library/Zend/I18n/Translator/TranslatorAwareTrait.php
	library/Zend/Stdlib/Hydrator/AbstractHydrator.php
	tests/.php_cs
	tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php
	tests/ZendTest/Loader/AutoloadableClass.php
	tests/ZendTest/Loader/MyLoader.php
	tests/ZendTest/Loader/MyOverloader.php
	tests/ZendTest/Loader/TestAsset/UnMappedClass.php
	tests/ZendTest/Version/VersionTest.php
	tests/ZendTest/View/_stubs/FilterDir1/Foo.php
	tests/ZendTest/View/_stubs/HelperDir1/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php
	tests/ZendTest/View/_stubs/HelperDir2/Datetime.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub1.php
	tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
[cs] Remove unnecessary use statements

The imported classes share the same namespace.
[psr0] Match class name with filename
[psr0] Fix namespaces
[test] Define default date.timezone setting