More tests for nested form fieldsets
Remove  PR #5093 code
CS fix
More tests
space after bool
Merge branch 'hotfix/6092'

Close #6092
Fixes #6089
Merge pull request #6100 from thestanislav/fix/collection

More tests for nested form fieldsets
[#6100] revert formatting changes

- Reverted to original (or what should have been in original)
Merge branch 'hotfix/6100' into develop

Forward port #6100