Extends media and image form types to accept PIM Media entity
Merge branch 'master' into feature/pim-1420