Pulled in pull request for ssl-certs var and tracking master