fix layout block forms and content types
update of media entity form type
Merge remote-tracking branch 'origin/master' into 2.3