Attrib fixture subtree merge

As a result of https://github.com/dimagi/commcare-hq/pull/2867, I'm subtree merging the changes from the reporting submodules into attrib-fixture branch of master.

@sravfeyn