Merge "Update bootstrap to resolve CVE-2018-14041"