Merge branch 'hotfix/4199' into develop

Forward port #4199
Merge pull request #4201 from robertboloc/#4172-test

Issue #4172 - Added tests for add/remove sequence in Zend\Form
Merge branch 'hotfix/4201'

Close #4201
Fixes #4172 (by demonstrating the issue via a unit test)
Merge branch 'hotfix/4201' into develop

Forward port #4201
Merge pull request #4203 from marc-mabe/master

Allow an instance of Zend\\Stdlib\\AbstractOptions to set configuration properties of the same class
[#4203] CS fixes

- per php-cs-fixer
Merge branch 'hotfix/4203'

Close #4203
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 pull request #4207 from glen-84/bugfix/default-plural-rule

Fixed default plural rule.
Merge branch 'hotfix/4207'

Close #4207
Merge branch 'hotfix/4207' into develop

Forward port #4207
Merge pull request #4210 from tux-rampage/rbac-issue

Fixed failure when implementing custom rbac roles
[#4210] CS fix

- docblock can simply refer to "self"
Merge branch 'hotfix/4210'

Close #4210
Merge branch 'hotfix/4210' into develop

Forward port #4210
[Curl] setOptions should merge config items that can be arrays
[#4213] Added group annotation to test

- to make it easier to run individual test. HTTP online tests are a
  pain!