last bit of bugfixes and cleanup
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x