Merge branch 'hotfix/4210'

Close #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!
Merge branch 'hotfix/4213' into develop

Forward port #4213