Aggragations/Filter - fix for es1.2 when no sub aggregations
Merge remote-tracking branch 'origin/fix-aggs-filter' into fix-aggs-filter