Merge pull request #3473 from github/mbg/start-proxy/cert-gen

Merge pull request #3473 from github/mbg/start-proxy/cert-gen #5605