Merge change 1739 into donut

* changes:
  Fix an NPE in the New Project Wizard when no test project is specified on the second NPW page.