trunk-3987NEW(1.8.x)

I have modified the changes .
changes to Trunk-3978NEW(1.8.x)
after doing mvn clean install
Merge pull request #572 from suraj5/Trunk-3987NEW(1.8.x)

trunk-3987NEW(1.8.x)
changed the description to match the current code
Merge pull request #579 from suraj5/Trunk-3987NEW(1.8.x)

changed the description to match the current code
TRUNK-3644 Define which resources to load for module based on OpenMRS version

(cherry picked from commit ee0d7cafb2816d3a216651c3efb607dc4b28cae0)
TRUNK-3644 Strip off qualifier when comparing versions

(cherry picked from commit 36f2c8da3e5c32ae836d4bb318d6b445e8062e2a)

Conflicts:
	api/src/main/java/org/openmrs/module/ModuleUtil.java