hand cherry-pick json-dos-fix to pl master
also apply fix for cookbook version
Merge branch 'apply-json-dos-fix-to-plmaster' into pl-master