Pull state reporting changes into 1606_ox branch

Yeah, looks like I removed that accidentally right before I committed last night. I just went through and made most of the improvements you specified.. in particular, we are actually incrementing a set of counters now instead of appending to a single JSON byte array (that statshub wouldn't understand anyway).