bug-790: change PEM-Armor-striping code to not break correct CSRs

(copied from somewhere above)