No need to evaluate ColumnExpression in
DistinctValueWithCountServerAggregator#aggregate()
Merge pull request #319 from anoopsjohn/master

No need to evaluate ColumnExpression in DistinctValueWithCountServerAggregator#aggregate()
partial work on secondary index cleanup
Merge branch 'master' into si

Synching si branch with master branch
Partial secondary index work