Backport PR #8500

---------

**Commit 1:**
Update expected table headers to fix functional test

* Original sha: f65c9b595b
* Authored by Matthew Bargar <mbargar@gmail.com> on 2016-09-26T12:40:41Z

**Commit 2:**
[indexPatterns] add workaround for elastic/elasticsearch#20707

* Original sha: 22c6f7c55c
* Authored by spalger <email@spalger.com> on 2016-09-30T10:21:07Z

src/ui/public/index_patterns/_enhance_fields_with_capabilities.js

@@ -9,6 +9,14 @@ export default function ($http) {
       const stats = _.get(res, 'data.fields', {});
 
       return _.map(fields, (field) => {
+        if (field.type === 'geo_point' && !stats[field.name]) {
+          // FIXME: remove once https://github.com/elastic/elasticsearch/issues/20707 is fixed
+          return _.assign(field, {
+            'searchable': true,
+            'aggregatable': true
+          });
+        }
+
         return _.assign(field, stats[field.name]);
       });
     });

test/functional/apps/management/_index_pattern_create_delete.js

@@ -52,8 +52,9 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
           'name',
           'type',
           'format',
+          'searchable',
+          'aggregatable',
           'analyzed',
-          'indexed',
           'controls'
         ];