Merge change 4031 into donut

* changes:
  SDK Updater: provide a "force http" setting.