Merge "Updating Search service to be ES 6.1.2 compliant"