Mode 2145 - Upgraded JUnit to 4.11 and Hamcrest to 1.3. Fixed additional issues caused by the upgrade.

This should be merged after https://github.com/ModeShape/modeshape/pull/1038