Archive more devices in general by using wild-card matching, avoid archiving...

Archive more devices in general by using wild-card matching, avoid archiving calibration tables. Also, fixes for dealing with wild-card device names.