Backport PR 522 to 1.8.x

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