Merge pull request #4963 from mattslocum/patch-1

fix(core): Fix watcher handler columnDefs assignment

Author: swalters

src/js/core/directives/ui-grid.js

@@ -67,7 +67,7 @@
 
       function columnDefsWatchFunction(n, o) {
         if (n && n !== o) {
-          self.grid.options.columnDefs = n;
+          self.grid.options.columnDefs = $scope.uiGrid.columnDefs;
           self.grid.buildColumns({ orderByColumnDefs: true })
             .then(function(){