Revert "Revert "Fixes to Custom CA Sample""

This reverts commit 5e82688a4856eabf11ea3bb037567dd4a395a370.