fix(@angular-devkit/build-angular): serve option merging is being overridden by defaults in schema#15328

mgechev merged 1 commit intoangular:masterangular/angular-cli:masterfrom

alan-agius4:option-mergingCopy head branch name to clipboard