1012636 - fix issues with CA management changes

https://bugzilla.redhat.com/show_bug.cgi?id=1012636