CB-6390: Update npm-shrinkwrap.json for release 0.21.5
Merge branch 'master' into 0.21.5