Merge the gnutls stuff with the cert updates
release-2.x.y
2017-03-07, Gary Kramlich