Merge pull request #734 from hflynn/rebased/develop/in-place-update

Improvements to import scenarios (rebased onto develop)
Merge pull request #733 from ximenesuk/dropbox-orphan-dev

Clarify location and group for DropBox imports. (rebased)
Proposal to add integration jobs as downstream of the push job

As the integration jobs currently rebuild their own server, their is no need
to wait until completion of the build jobs to trigger them.
merge develop -D org: PR 735 (Proposal to add integration jobs as downstream of the push job)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 6c60e92..c3a6c18
Merged PRs (fast-forward):
  # PR 733 ximenesuk 'Clarify location and group for DropBox imports. (rebased)'
  # PR 734 hflynn 'Improvements to import scenarios (rebased onto develop)'

Merged PRs:
  # PR 735 sbesson 'Proposal to add integration jobs as downstream of the push job'

Generated by OMERO-5.1-merge-push#154 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/154/)