Issue #2376691 by slashrsm: Fix few minor things.
Merge branch '2376691' into media_storage_plugin
Merge branch 'media_storage_plugin' into media_entity_plugin
Issue #2376703 by slashrsm: Media entity integration.
Issue #2376697 by slashrsm: File entity integration.