Made all multi-bucket aggs return consistent response format

Closes #4926