Merge "Carrier Wifi: changing the uri being sent when a certificate is downloaded." into pi-dev