refactored

Conflicts:

	geomesa-core/src/main/scala/org/locationtech/geomesa/core/index/IndexSchema.scala
	geomesa-core/src/main/scala/org/locationtech/geomesa/core/index/QueryPlanner.scala