Merge r452424.
Update to 5.5.58 release.
Approved by: portmgr (swills) Security: c41bedfd-b3f9-11e7-ac58-b499baebfeaf