CDC/ACM. Fix several known problems resulting from merge of USB composite...

CDC/ACM.  Fix several known problems resulting from merge of USB composite device.  That merge now breaks some of the non-composite USB devices.  These fixes are for CDC/ACM.