Remove `FormBuilder` deprecation warning about block argument and associated tests
Merge pull request #11227 from vipulnsward/form_builder

Remove `FormBuilder` deprecation warning about block argument and tests