Jag/ocsmanager cert merge

Merge-fiendly version of  #1352