Carry through changes from Islandora.

Dependent on:
* https://github.com/Islandora/islandora/pull/382