certmanager: Fix. Again.
Merge 0.10->trunk