Review notification sequence.
Remove tabs and whitespace.
Use python's json rather than Django's

django.utils.simplejson is deprecated; Python 2.6+ includes json.
Format.
Modify constructor to handle directory correctly.
Reduce the number of transactions for createOrFixUserDir (See #10740)
Encapsulate all mkdir calls into one tx (See #10740)

A single transaction can be used from suggestImportPaths
to create all directories needed for an entire fileset.
This brings one call of `importFileset()` from 16 down
to 6 seconds.
Check each parent directory only once
Use cached OriginalFile rather than query
Add event before upload location is resolved.
Add support for new Prep Upload event
Fix expandTemplate usage in test
removing to resolve conflict

Conflicts:
	components/tools/OmeroWeb/omeroweb/webgateway/views.py
Merge remote-tracking branch 'origin/develop' into simplejson_upgrade

Conflicts:
	components/tools/OmeroWeb/omeroweb/webgateway/views.py
Merge remote-tracking branch 'origin/develop' into 10740-plate-imports
Close callback at the end of import

omero.cmd.HandleI servants were being left on the server after
CLI imports. This should release any resources held by them.
Add Rethrow logic for handling ServerErrors

An omero.ServerError was being thrown from within an
Executor.SimpleWork instance. Previously, this exeception
would have escaped to the client. Due to the refactoring
on this branch, it was being wrapped by an InternalException.
Now we specifically check for this case, and rethrow the
original exception.
Merge pull request #1876 from jburel/import-notification

Import notification
Fix import exception window sizing.
Update develop submodules

Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Repository: openmicroscopy/bioformats
Updating 9bc1862..e3f13fa
Merged PRs (fast-forward):
  # PR 817 rleigh-dundee 'xsd-fu: Split fu.py into separate modules'

Repository: ome/scripts
Updating d7a0feb..1f0f9d0
Merged PRs (fast-forward):
  # PR 54 joshmoore '11607 README update'
  # PR 56 will-moore '1822 script param fix'

Repository: openmicroscopy/ome-documentation
Updating b13a649..412e806
Merged PRs (fast-forward):
  # PR 579 sbesson 'Matlab additional fixes'
  # PR 574 knabar 'Update web application development page for Django 1.6'
  # PR 577 hflynn '11795 fix - Python version 2.6.5 or later required'
  # PR 572 hflynn 'Adding contributing docs to OME docs repo readme'
  # PR 557 mtbc 'remind that model changes may affect IceMapper'
  # PR 575 ximenesuk 'Update DropBox docs for develop'
  # PR 569 bpindelski 'Add group and test method execution doc (see #11677)'
  # PR 567 hflynn 'Updating contributing developer guidance'
  # PR 566 sbesson 'Document latest OMERO.matlab functions'

Generated by OMERO-submods-develop#262 (http://hudson.openmicroscopy.org.uk/job/OMERO-submods-develop/262/)