Merge StringTermsAggregator.java and LeafStringTermsAggregator.java.
- fixed a couple of bugs in the AggregatorFactories
- fixed a bug in the StringTermsAggregator#buildAggregation method