Latest commits to SonataBlockBundle break the media bundle so making some adjustments for compatibility