Merge change 4685 into donut

* changes:
  SDK Updater: use separate license node in XML. Support extra packages.