Merge branch '4_6_x' into 23853

diff --cc npm-shrinkwrap.json
index 9bb5a07,40bfd2c..2ce6b8d
--- 1/npm-shrinkwrap.json
--- 2/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@@ -348,10 -308,13 +348,14 @@@
          }
        }
      },
+     "node-forge": {
+       "version": "0.6.2",
+       "from": "node-forge@0.6.x"
+     },
      "oauth2orize": {
        "version": "0.1.0",
 -      "from": "oauth2orize@0.1.x",
 +      "from": "oauth2orize@0.1.0",
 +      "resolved": "https://registry.npmjs.org/oauth2orize/-/oauth2orize-0.1.0.tgz",
        "dependencies": {
          "debug": {
            "version": "0.7.4",