BZ-11634: Complete the changes to the New Project Wizard
Merge branch 'EBPbranch' of https://github.com/NoesisEnergy/bootstrap into EBPbranch