don't override context when not finalizing
restore previous behavior of not optimizing Timeseries post-aggregators
clean up code
Merge pull request #492 from metamx/post-agg-fix-2

fix post aggregator
prepare for next release
[maven-release-plugin] prepare release druid-0.6.95
[maven-release-plugin] prepare for next development iteration
merge changes from master