Merge change 4575 into donut

* changes:
  SDK Updater: Better guess for the addon folder name.