Notice and comment fix.
Merge branch '7.x' of github.com:jordandukart/islandora into 7.x