7.x collection changes

Stuff needed for:
Islandora/islandora_solution_pack_collection/pull/39