AMRS-260:A quick fix for AMPATH Kenya fast search
Merge branch '1.9.7-custom' of https://github.com/mhawila/openmrs-core into 1.9.7-custom