Consolidate Geo and Geometry folders
Skip children and scripted metric agg tests on ES < 1.4