Merge remote-tracking branch 'klown/master'

* klown/master:
  GPII-920: Modify USB lib grunt tasks to handle non-fatal errors gracefully.