Formatting fixes, code cleanup.
Fixes for base classes that were updated.
Fixed instrument control logic for discover unknown, stop autosample