Merge change 2863 into donut

* changes:
  SDK Updater: Minor change to make composite constructor compliant with SWT designer.