Merge in strategic changes to update-analysis to allow selection of file based databases from master branch