Update borschik and apw
Update npm-shrinkwrap.js and add scripts/fix-npm-shrinkwrap.js to remove `resolved` property from npm-shrinkwrap.js file