Upgrades webpack-dev-server
and webpack-cli
#1229
Merged
webpack-dev-server
and webpack-cli
#1229