Fixed regression in USBAPI and CDC (xaljox)

See:
https://github.com/arduino/Arduino/commit/9ac7e30252fce5b9dafde3288519b020b73c37bd#commitcomment-6718676
Merge branch 'master' into ide-1.5.x