Make grunt concat js files when watching
Merge pull request #14336 from michaeljayt/patch-2

Make grunt concat js files when watching