Fixed attribute use of USER_NAME instead of USERNAME per TSK change
Merge branch 'master' of https://github.com/sleuthkit/autopsy
Merge branch 'master' of https://github.com/sleuthkit/autopsy into zipmodule
Fix processing of derived files by keyword search