Revert to hamcrest 1.1
Merge branch 'mbst-7489-store-similar-content' into stage