change self:: with static:: in call-ing static property/method
Merge branch 'hotfix/5212' into develop

Forward port #5212
Merge branch 'hotfix/5220' into develop

Forward port #5220
Merge pull request #5226 from dpommeranz/fix/form-label-options

Fix/form label options
Merge branch 'feature/5226' into develop

Close #5226
Merge pull request #5237 from turrsis/hotfix/serviceManager-trollAbstractFactories(4285)

ServiceManager - fix AbstractFactories performance and service waiting
[#5237] Consistency fix

- Return from conditional
- Promote else
Merge branch 'feature/5237' into develop

Close #5237
Merge pull request #5238 from dpommeranz/fix/allow-empty-fieldset-labels

allow empty fieldset labels in formCollection view helper
Merge branch 'feature/5238' into develop

Close #5238
Merge pull request #5242 from dpommeranz/fix/form-collection-attributes

form collection attributes

Conflicts:
	library/Zend/Form/View/Helper/FormCollection.php
	tests/ZendTest/Form/View/Helper/FormCollectionTest.php
Merge branch 'feature/5242' into develop

Close #5242
Merge pull request #5262 from blanchonvincent/feature/zend-code-function-prototype

Zend code method prototype
Merge branch 'feature/5262' into develop

Close #5262
Merge branch 'hotfix/5271' into develop

Forward port #5271
Merge pull request #5272 from henriquemoody/paginator_adapter_callback

Create Callback adapter for Zend\Paginator
[#5272] Grammar cleanup

- Updated docblocks to use better grammatical phrasing.
Merge branch 'feature/5272' into develop

Close #5272
Merge branch 'hotfix/5279' into develop

Forward port #5279
Merge branch 'hotfix/5280' into develop

Forward port #5280