allow setting of terms aggregation size
Merge branch 'terms_aggregation_size'