TRUNK-3944: Incorrect mockito, hamcrest and junit dependencies
(cherry picked from commit 0a53179f51b24a43b53717b76172e0e074710035)

Conflicts:
	pom.xml
	test/pom.xml
TRUNK-3944: Updated junit to 4.11 and fixed tests
(cherry picked from commit b2889f14e85ae1f55f763a1c109df4fdb40caf9b)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
TRUNK-3944: Created OpenmrsMatchers
(cherry picked from commit e37a2e967a5130d1846d92f1f2dd3fe8d51b2b8b)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
TRUNK-3944: Responded to review comments
(cherry picked from commit 56c743b869668cef595160db7b6247c9d2c4bde8)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
TRUNK-3944: Responded to more review comments
(cherry picked from commit 171f0cfeaf649a0bc26479b8968001d82d9db934)