LB-1394 Improvements to Gruntfile.js