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

(copied from somewhere above)
bug-790: Add a descriptive text for orgClient ...

... to help people to see where the CSR should go.
bug-790: update the text for orgClientCert

According to common decision in SAP meeting.
Merge branch 'bug-790' into testserver-stable