fix(serve): merge CLI and devServer options correctly#1649

anshumanv merged 28 commits into

webpack:nextwebpack/webpack-cli:nextfrom

knagaitsev:fix/dev-server-options-mergingknagaitsev/webpack-cli:fix/dev-server-options-mergingCopy head branch name to clipboard