[TEST] Remove random templates for ConcurrentDynamicTemplateTests
Remove circular dependency between IndicesService and IndicesStore

Conflicts:
	src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
	src/main/java/org/elasticsearch/indices/store/IndicesStore.java