Merge remote-tracking branch 'origin/rest_handlers_services' into rest_handlers_services

Author: alexey-ivanov-es

server/src/main/java/org/elasticsearch/action/ActionModule.java

@@ -215,7 +215,6 @@
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
-import org.elasticsearch.cluster.project.ProjectIdResolver;
 import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.routing.RerouteService;
 import org.elasticsearch.cluster.service.ClusterService;