Update FileManager for new SleuthkitCase transaction API
Merge remote-tracking branch 'upstream/develop' into case_db_thread_safety
Merge remote-tracking branch 'upstream/develop' into base_case_db_conn_per_thread
Remove unused import from FileManager.java
Update AddImageTask for non-static case db locking API
Fix bug in DeletedContent.DeletedContentChildren.createKeys()
Resolve merge conflict for merge in of develop
Merge remote-tracking branch 'upstream/develop' into case_db_conn_per_thread
Merge remote-tracking branch 'upstream/develop' into case_db_conn_per_thread
Merge pull request #853 from rcordovano/case_db_conn_per_thread

Case db conn per thread