First draft of workaround for #520
Changes from CR
Merge branch 'master' of github.com:facebook/osquery into 520_pt_json_workaround
Merge pull request #537 from eastebry/520_pt_json_workaround

[Draft] - potential workaround for #520