Merge pull request #17866 from bogdan/default-form-builder

Bugfix config.action_view.default_form_builder option