Revert "Vinay | #845 | Add ability to search by cityVillage"

This reverts commit c6d4344dffc6f18d3b68c13b3f0a64f48bae0fdd.

Conflicts:
	api/src/main/java/org/openmrs/PatientSearchParameters.java
	api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
	api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
	api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java