Revert "GEOMESA-508 Factoring Out Common Code from STIdxStrategy and QueryPlanner"

This reverts commit b86bfc6540e8b1998d241e086f3e8bdcb9566105.

This is neccessary as this commit acquired a different hash than that from the parent.