BUG Issues with CMSForm not consistently respecting new form naming scheme.
Fixes for failing CMSFormTest cases
Merge pull request #2623 from tractorcow/pulls/3.2-form-naming-fixes

BUG 3.2 Issues with CMSForm not consistently respecting new form naming scheme