Jag/ocsmanager cert merge