Conflicts:
	core/src/main/java/org/elasticsearch/search/SearchService.java