Backport 7 fix.
Merge branch '6.x' of github.com:jordandukart/islandora_scholar into 6.x