BZ-11634: Complete the changes to the New Project Wizard