Manual Normalization normalization.csv matches subfolders

refs #4922

Update manual normalization with normalization.csv to match original files
based on the full path from the objects folder, not just the basename.  This
allows original files to be stored in subfolders, and the normalization.csv
to reference them there.
Fix ElasticSearch bug
Actually save FPRule after modify counts

refs #6611

Use Django's F() construct to update the counts in a way that avoids race
conditions from several instances of the same rule running at once.
Transfer: Only display zip files for Zipped Bag transfer type

refs #6885

Use default filter for DirectoryPickerView which only displays folders
for most transfer types.  If foldersOnly is not set, use a custom
filter to display zips.  Set foldersOnly based on the transfer type.
Change extract option choices to yes/no

Fixes #6539
MCPClient: add bulk_extractor, sleuthkit
mysql_dev1: remove merge spam