Issue #2376691 by slashrsm: Fix few minor things.
Merge branch '2376691' into media_storage_plugin