Move hamcrest beans packages to be in sync with other modular it
packages