allow client config to supply a custom CA certificate

Bug: 1009371
Change-Id: I4d7f8e43643a5441366b6f3832dbfa28378890db
Merge "allow client config to supply a custom CA certificate" into develop