Merged fs fixes

This branch combines:
 * @ximenesuk 's http://trac.openmicroscopy.org.uk/ome/ticket/10928 and
 * @bpindelski 's http://trac.openmicroscopy.org.uk/ome/ticket/10954
fixes. 

#### 10928 ####
Log file IDs should show up before the very first step returns and be available throughout the process:
```
2013-05-24 08:12:05,020 5032       [l.Client-1] INFO   ormats.importer.cli.LoggingImportMonitor  - METADATA_IMPORTED Step: 1 of 5  Logfile: 1362
2013-05-24 08:12:05,341 5353       [l.Client-0] INFO   ormats.importer.cli.LoggingImportMonitor  - PIXELDATA_PROCESSED Step: 2 of 5  Logfile: 1362
2013-05-24 08:12:05,582 5594       [l.Client-2] INFO   ormats.importer.cli.LoggingImportMonitor  - THUMBNAILS_GENERATED Step: 3 of 5  Logfile: 1362
2013-05-24 08:12:05,616 5628       [l.Client-1] INFO   ormats.importer.cli.LoggingImportMonitor  - METADATA_PROCESSED Step: 4 of 5  Logfile: 1362
2013-05-24 08:12:05,658 5670       [l.Client-0] INFO   ormats.importer.cli.LoggingImportMonitor  - OBJECTS_RETURNED Step: 5 of 5  Logfile: 1362
```
Also the size in the DB should be incremented after each step.

#### 10954 ####
When uploading a fileset with a companion file (e.g. *.dv.log), a FileAnnotation should be created for the dv.log file and attached to the image with the ns `openmicroscopy.org/omero/import/companionFile`.