Rest-api-spec repo has been merged with elasticsearch proper

Changing the git submodule and moving it top level to avoid traversing
the es source code during test discovery

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "test_elasticsearch/rest-api-spec"]
-	path = test_elasticsearch/rest-api-spec
-	url = https://github.com/elasticsearch/elasticsearch-rest-api-spec.git
+[submodule "rest-api-spec"]
+	path = rest-api-spec
+	url = https://github.com/elasticsearch/elasticsearch.git

test_elasticsearch/test_server/test_common.py

@@ -191,9 +191,8 @@ def construct_case(filename, name):
 YAML_DIR = environ.get(
     'YAML_TEST_DIR',
     join(
-        dirname(__file__),
-        pardir, 
-        'rest-api-spec', 'test'
+        dirname(__file__), pardir, pardir,
+        'rest-api-spec', 'rest-api-spec', 'test'
     )
 )