Merge r4685 r4686 r4687 r4688 r4689 r4690 r4691 into 5.41-6.6 drivedb.h branches.

Drop maintenance of 5.40 branch due to incompatibility with wildcard USB entries.


git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4692 4ea69e1a-61f1-4043-bf83-b5c94c648137