Merge pull request #2231 from reaperhulk/simplify-certbuilder

Simplify Cert and CSR Builder