Remove some duplicate code, simplify

The this_csr_is_for_the_current_host method appeared twice (apparently a
merge error), and produced more confusion than was removed by factoring
it out of the generate_certificate_request method, since "this" in this
case is a host, not a CSR.
Merge pull request #1558 from djmitche/dupcode

Remove some duplicate code, simplify