Merge pull request #7832 from markmckinnon/2452-change-ct-option-panel

...tech/df/cybertriage/autopsy/ctoptions/CTOptionsPanel.java

...cybertriage/autopsy/ctoptions/LicenseDisclaimerPanel.java

...f/cybertriage/autopsy/ctoptions/ctcloud/Bundle.properties

...triage/autopsy/ctoptions/ctcloud/Bundle.properties-MERGED

...riage/autopsy/ctoptions/ctcloud/CTLicensePersistence.java

...topsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.form

...topsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java

...iage/autopsy/ctoptions/ctcloud/MalwareIngestSettings.java

.../df/cybertriage/autopsy/incidentoptions/Bundle.properties

...ertriage/autopsy/incidentoptions/Bundle.properties-MERGED

...autopsy/incidentoptions/CTIncidentImportOptionsPanel.form

...autopsy/incidentoptions/CTIncidentImportOptionsPanel.java

...ch/df/cybertriage/autopsy/incidentoptions/CTSettings.java

...triage/autopsy/incidentoptions/CTSettingsPersistence.java

...tech/df/cybertriage/autopsy/malwarescan/Bundle.properties

.../cybertriage/autopsy/malwarescan/Bundle.properties-MERGED

...ertriage/autopsy/malwarescan/MalwareScanIngestModule.java

...e/autopsy/malwarescan/MalwareScanIngestModuleFactory.java

...triage/autopsy/malwarescan/MalwareScanIngestSettings.java

...e/autopsy/malwarescan/MalwareScanIngestSettingsPanel.form