2i: Minor refactoring
2i: Improvements in query/filter construction.
2i: Added index compaction to keyspace compaction job
2i: Refactoring in compaction/optimize
2i: Improve index compaction/merge
Merge branch 'release/2.0.82' into develop