usnic: remove concept of CQ groups, and merge in latest from common code

Signed-off-by: Reese Faucette <rfaucett@cisco.com>