fix unit tests to handle form_pages being a paginator.Page instance
Remove label_suffix from form builder forms by default, but make that preference overrideable in the FormPage class
Merge remote-tracking branch 'upstream/form-builder' into form-builder