Merge branch 'master' into remove-batch-searches

.github/CODEOWNERS

@@ -29,9 +29,9 @@
 /src/plugins/vis_type_timelion/ @elastic/kibana-app
 /src/plugins/vis_type_timeseries/ @elastic/kibana-app
 /src/plugins/vis_type_vega/ @elastic/kibana-app
-/src/plugins/vis_type_vislib/ @elastic/kibana-app
-/src/plugins/vis_type_xy/ @elastic/kibana-app
-/src/plugins/vis_type_pie/ @elastic/kibana-app
+/src/plugins/vis_types/vislib/ @elastic/kibana-app
+/src/plugins/vis_types/xy/ @elastic/kibana-app
+/src/plugins/vis_types/pie/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/visualizations/ @elastic/kibana-app
 /src/plugins/url_forwarding/ @elastic/kibana-app
@@ -144,7 +144,6 @@
 /x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
 /x-pack/test/functional/apps/canvas/  @elastic/kibana-presentation
 #CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
-#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
 
 # Machine Learning
 /x-pack/plugins/ml/  @elastic/ml-ui

.i18nrc.json

@@ -63,9 +63,9 @@
     "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
     "visTypeTimeseries": "src/plugins/vis_type_timeseries",
     "visTypeVega": "src/plugins/vis_type_vega",
-    "visTypeVislib": "src/plugins/vis_type_vislib",
-    "visTypeXy": "src/plugins/vis_type_xy",
-    "visTypePie": "src/plugins/vis_type_pie",
+    "visTypeVislib": "src/plugins/vis_types/vislib",
+    "visTypeXy": "src/plugins/vis_types/xy",
+    "visTypePie": "src/plugins/vis_types/pie",
     "visualizations": "src/plugins/visualizations",
     "visualize": "src/plugins/visualize",
     "apmOss": "src/plugins/apm_oss",