[6.x] Correct recursive form data merging#13413

mikemartin wants to merge 3 commits intostatamic:masterstatamic/cms:masterfrom

mikemartin:fix-merge-form-datamikemartin/cms:fix-merge-form-dataCopy head branch name to clipboard