different help text for certificates fixes #698
Merge branch 'conversion' into testing