Merge branch 'hotfix/2907' into develop

Forward port #2907
Merge branch 'hotfix/2909' into develop

Forward port #2909
Forward port #2994
Forward port #2997
Change assertModule to assertModuleName to keep consistency
Update library/Zend/Json/Server/Response.php
Update tests/ZendTest/Json/Server/ResponseTest.php
keep consistency with error message, add assertHeader*, assertRedirect*, move tests controller files
Add a bunch of traits to ZF2

As requested @

https://github.com/protecinnovations/zf2-traits/issues/1

This is the initial commit to start getting traits into ZF2.

We need to move our tests over - which are currently using Mockery.
Improve coding standards on new traits, add tests
Fix Minor problems with tests
Update library/Zend/Json/Server/Response.php
add assertXpathQuery* methods, move files to keep organisations, remove unused namespace
Improve function comment quality, clean up tests a little
Merge branch 'hotfix/2924' into develop

Forward port #2924
Merge branch 'hotfix/2930' into develop

Forward port #2930
Merge branch 'hotfix/2937' into develop

Forward port #2937
PRG Plugin fixes: Incorrect use of session hops expiration
fixing the problem with order and \Zend\Db\Sql\Expression
Merge branch 'form/date-time-select' of git://github.com/bakura10/zf2 into feature/2947