(cherry picked from commit 2c58562d48) Addresses some known vulns in 3.6.6: https://pivotal.io/security/cve-2017-4965
2c58562d48