Change additional CA cert bundle support to be more flexible