Updates @ScanImporter annotations to handle more metadata including scan type determination.
Merge commit '482d8c00bccaa53698a0916c24cc3f6e39040406' into HEAD