test if soledad daemon is running
fix dependency on x509 ca_bundle class (#6410)

Change-Id: Ia1e7009240d61464d7ba45ad07291664f6a3b768
Merge remote-tracking branch 'elijah/feature/soledadtest' into develop
fixed bug when there is no vpn service
Merge remote-tracking branch 'origin/develop' into pixelated/develop