TRUNK-3407: ConceptDescription equals method fails with 2 different instances of ConceptDescription in 1.8 and earliergit
Back porting to 1.8.x: @StartModule does not work - TRUNK-3508
Back porting to 1.8.x: Home Key doesn't work in the search boxes -
TRUNK-3220
Back porting wyclif's changes for including tests to improve the logic …
for selecting the preferred name - TRUNK-3232
Back porting: Concept search should display the name containing all word
tokens when multiple words are entered - TRUNK-3232
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)
Merge pull request #282 from NameFILIP/TRUNK-3407

TRUNK-3407: ConceptDescription equals method fails with 2 different instances of ConceptDescription in 1.8 and earlier
Cannot find concept by id in concept auto complete - TRUNK-3893(cherry picked from commit ea4e8449dac09f670d580eaabda2c5b756f2fdb3)
orward porting to 1.8.x: EL functions defined in modules are not
accessible when used in portlets - TRUNK-3743
Corrected handling multiple handlers

(cherry picked from commit 7bce797c06f4b6751fa1e9464cf2281c903510d1)
TRUNK-4040 Preferred concept name tags converted improperly
Revert "TRUNK-4040 Preferred concept name tags converted improperly"

This reverts commit e354eda32b8d288805a8fa8d2a4502987cc9dc48.
TRUNK-4040 Preferred concept name tags converted improperly
TRUNK-4042 Application Data directory location read from system property

(cherry picked from commit 2e04b5b09fc12640317a41c659ccd97c164a79d2)