Revert "split out BucketResult into a base class"
Revert "split out BucketResult into a base class"

This reverts commit e271b325597e987ec9dceb2818a03cd6af82ccdb.

qedsoftware/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq,qedsoftware/commcare-hq,qedsoftware/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq