Incorporates fix from https://github.com/angular/angular-cli/pull/15041 which changed the behavior of registering schematic defaults
Incorporates fix from https://github.com/angular/angular-cli/pull/15041 which changed the behavior of registering schematic defaults