Merge pull request #4541 from sleuthkit/revert-4534-3912_merge_bundles

.gitattributes

Core/build.xml

...rc/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED

...sleuthkit/autopsy/allcasessearch/Bundle.properties-MERGED

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

...psy/casemodule/datasourceSummary/Bundle.properties-MERGED

...hkit/autopsy/casemodule/services/Bundle.properties-MERGED

...uthkit/autopsy/centralrepository/Bundle.properties-MERGED

.../centralrepository/contentviewer/Bundle.properties-MERGED

...opsy/centralrepository/datamodel/Bundle.properties-MERGED

...centralrepository/eventlisteners/Bundle.properties-MERGED

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

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

...t/autopsy/commonpropertiessearch/Bundle.properties-MERGED

...sleuthkit/autopsy/communications/Bundle.properties-MERGED

...sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED

Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED

.../autopsy/corecomponentinterfaces/Bundle.properties-MERGED

...sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED

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