Merge changes I45054e68,I6f301314

* changes:
  Make the service timeout and blob lifetime configurable
  Call server based implementation to persist reboot escrow key