Replacing 'layout' in regexp for a more generic regexp

When searching the right name for fields we expected that the 'layout' field was indeed called layout, but in some cases (talking about nocms-admin-menus here) that field may be called some other way, so we can't rely on layout, we must search something more general
Merge branch 'features/nested-block-generalization'