By rblanker: Fixing merging code for stills during upgrade path. Also fixed problem when adding new filename field to job table.
Version 3.5.x-RC2 build 2060.