Issue #2209977 by tim.plunkett: Move form validation logic out of FormBuilder into a new class.