fix layout content array

After a form validation error updating a layout block, the field names change, are no longer in a deep array.
Therefore data needs to be handeld slightly differently when resubmitted
Merge branch 'hotfix/layout-block-update' into 2.5