Backport Grunt and test fixes from master to v2 branch