Issue #2870789 by ralphvdhoudt, ruudvanoijen: Update to media 2.1 and prefered versions of dependent modules