Latest commits to SonataBlockBundle break the MediaBundle

Latest commits to SonataBlockBundle break the MediaBundle so I made a few changes in the MediaBlockService to bring it more in-line with the latest changes in the BlockBundle