Merge branch '7.x' of https://github.com/Islandora/islandora_solution_pack_collection into 7.x
satiating travis
merging changes