The simulator keystores have to be updated every time the certificates expire.  As these are only used in junits and CSITs, this work can be avoided by changing them to use HTTP instead of HTTPS.