Fix mismerge and include the nvme support. Also, print out the name of any CCB's functions that's not supported.
MFC after: 1 week