Merge branch 'hotfix/2951' into develop

Forward port #2951
Merge branch 'hotfix/2952' into develop

Forward port #2952
Merge branch 'hotfix/2957' into develop

Forward port #2957
Merge branch 'hotfix/2976' into develop

Forward port #2976
Merge branch 'hotfix/2981' into develop

Forward port #2981
Merge branch 'hotfix/2986' into develop

Conflicts:
	library/Zend/Code/Scanner/PropertyScanner.php
Merge branch 'hotfix/2987' into develop

Forward port #2987
Merge branch 'hotfix/3002' into develop

Forward port #3002
Merge branch 'hotfix/3003' into develop

Forward port #3003
Merge branch 'hotfix/3006' into develop

Forward port #3006
Merge branch 'hotfix/3008' into develop

Forward port #3008
Merge branch 'hotfix/3009' into develop

Forward port #3009
Merge branch 'develop' of git://github.com/pkarc/zf2 into hotfix/3011
[#3011] CS fixes

- trailing whitespace
Merge branch 'hotfix/3011' into develop

Close #3011
Merge branch 'fix/prg-plugins' of git://github.com/cgmartin/zf2 into hotfix/3016
Merge branch 'hotfix/3016' into develop

Close #3016
sending the test file of Fixing the problem with order and \Zend\Db\Sql\Expression
Merge branch 'hotfix/3013' into develop

Forward port #3013
Check that service locator exists

- before attempting to pull something from it