Issue #3461309 by charlliequadros, annmarysruthy, sivaji_ganesh_jojodae, smustgrave, mstrelan, larowlan: Refactor FormTestClickedButtonForm::buildForm (cherry picked from commit 2d31d3e8)
#497090
#497073
#497064