common refactoring to improve handling multiple attr filters in ANDs

Conflicts:

	geomesa-core/src/main/scala/org/locationtech/geomesa/core/index/QueryStrategyDecider.scala