Add assertj-core and assertj-guava dependencies to project pom

This change will also be backported to the 1.8.x branch in another PR.