ACCUMULO-2826 Allow single CF for IntersectingIterator
ACCUMULO-3204 Remove old, unused classes
Merge remote-tracking branch 'ryanleary/ACCUMULO-2826' into 1.6
Merge branch '1.6'