Merge proposals dependent on lp://qastaging/~soren/surveilr/consolidate-returned-json-objects

1. consolidate-returned-json-objects
2. Dependent merge proposals