Merge branch 'feature/4178' into develop

Close #4178
Merge branch 'hotfix/4183' into develop

Forward port #4183
Merge branch 'hotfix/4184' into develop

Forward port #4184
Merge branch 'hotfix/4198' into develop

Forward port #4198
Merge branch 'hotfix/4199' into develop

Forward port #4199
Merge branch 'hotfix/4201' into develop

Forward port #4201
Merge branch 'hotfix/4203' into develop

Forward port #4203
Merge pull request #4204 from macnibblet/hotfix/#4202

Hotfix for #4202
[#4204] CS fixes

- require/suggest should be in alphabetic order
Merge branch 'hotfix/4204' into develop

Close #4204
Fixes #4202
Merge branch 'hotfix/4207' into develop

Forward port #4207
Merge branch 'hotfix/4210' into develop

Forward port #4210
Implementing first version of delegate factories for services
Allowing multiple wrapped delegates
Minor CS fixes
Fixing problem with 5.3 compatibility (wrong context for $this)
Renaming 'delegates' => 'delegators'
Renaming 'delegates' => 'delegators'
Merge branch 'hotfix/4213' into develop

Forward port #4213
Merge branch 'hotfix/4216' into develop

Forward port #4216