Merge OpenMRS ws into ws-bundle

https://trello.com/c/8o3SahRV

Merged modules/openmrs/ws-bundle &  modules/openmrs/ws into ws only.

Change-Id: I58a9b7890e9e86b1d5d185ed2f253dd56bdb724a