Bug 984718 - [keyboard refactor] Fix jshint errors +shepherd