Bugfix: Update build with latest media patches to improve media tokens.

## Ready State: Yes

Improves on existing patches and adds new glue patch to fix up file document tokens.

## Requirements & Dependencies

* None

## Deployment Instructions

* Merge code.
* Rebuild `imagex_media`

## Usage/Test Instructions

* Make sure build runs and patches apply cleanly.
* Make sure to clear browser cache for testing, in addition to Drupal caches
* Test media tokens, especially documents like pdfs