7.x derivatives

Dependent on https://github.com/Islandora/islandora/pull/380