Merge changes Ia43ab0ab,I0c4b91aa

* changes:
  Always use the server based provider if HAL isn't installed
  Dump the IOexception before retrying load escrow key