less warnings
Merge branch '7.x' of github.com:willtp87/islandora_restricted into 7.x
for jordan