Merge remote-tracking branch 'upstream/develop' into version-number-updates

...org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED

Core/src/org/sleuthkit/autopsy/casemodule/Case.java

...y/centralrepository/optionspanel/Bundle.properties-MERGED

...y/centralrepository/optionspanel/GlobalSettingsPanel.java

...org/sleuthkit/autopsy/communications/CVTPersonaCache.java

...viewers/artifactviewers/GeneralPurposeArtifactViewer.form

...viewers/artifactviewers/GeneralPurposeArtifactViewer.java

...y/contentviewers/artifactviewers/MessageAccountPanel.java

...contentviewers/artifactviewers/PersonaAccountFetcher.java

...y/contentviewers/textcontentviewer/StringsTextViewer.java

Core/src/org/sleuthkit/autopsy/core/UserPreferences.java

...sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java

...leuthkit/autopsy/corecomponents/DataContentViewerHex.java

...hkit/autopsy/corecomponents/DataContentViewerUtility.java

...g/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java

...g/sleuthkit/autopsy/datamodel/DataSourceGroupingNode.java

.../src/org/sleuthkit/autopsy/datamodel/utils/IconsUtil.java

...thkit/autopsy/datasourcesummary/datamodel/CityRecord.java

...utopsy/datasourcesummary/datamodel/ClosestCityMapper.java

...topsy/datasourcesummary/datamodel/GeolocationSummary.java