Merge "build: Bump grunt-jscs to 2.1.0 and make pass"