Fixed coding standards issues.
Merge branch '7.x' of https://github.com/christianselig/islandora_solution_pack_book into 7.x