Mihir | #0 | Upgrading openmrs webservices rest version
Merge remote-tracking branch 'origin/release-4'

Conflicts:
	distro/pom.xml