Removing server extraction from settings. We assume is always first server from the list
Merge pull request #1301 from will-moore/omeroweb_examples_fixes

ROIs right_plugin uses .omeroweb_right_plugin()
Fix OMERO-merge-stable build.
merge dev_4_4 -D org -I include -E exclude: PR 988 (webgallery prototype from github/will-moore/webgallery)
merge dev_4_4 -D org -I include -E exclude: PR 1126 (Fix long-missing DELETE EventLogs)
merge dev_4_4 -D org -I include -E exclude: PR 1249 (Dataset creation 11048)
merge dev_4_4 -D org -I include -E exclude: PR 1321 (Insight connectors dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1333 (Fix OMERO.matlab delete functions using omero.cmd.DoAll)
merge dev_4_4 -D org -I include -E exclude: PR 1340 (Selenium2 update 11246)
merge dev_4_4 -D org -I include -E exclude: PR 1364 (Increase passing tests in OmeroJava)
merge dev_4_4 -D org -I include -E exclude: PR 1365 (Handle trans. range before filter (Fix #11017) (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1369 (Insight tidyup)
merge dev_4_4 -D org -I include -E exclude: PR 1370 (Update SchemaResolver.java on dev_4_4 with changes from develop)
merge dev_4_4 -D org -I include -E exclude: PR 1372 (Remove emanScripts tests)
merge dev_4_4 -D org -I include -E exclude: PR 1374 (Update dev_4_4 submodules)
merge dev_4_4 -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 988 will-moore 'webgallery prototype from github/will-moore/webgallery'
  # PR 1126 joshmoore 'Fix long-missing DELETE EventLogs'
  # PR 1249 will-moore 'Dataset creation 11048'
  # PR 1321 jburel 'Insight connectors dev 4 4'
  # PR 1333 sbesson 'Fix OMERO.matlab delete functions using omero.cmd.DoAll'
  # PR 1340 will-moore 'Selenium2 update 11246'
  # PR 1364 bpindelski 'Increase passing tests in OmeroJava'
  # PR 1365 joshmoore 'Handle trans. range before filter (Fix #11017) (rebased onto dev_4_4)'
  # PR 1369 mtbc 'Insight tidyup'
  # PR 1370 bpindelski 'Update SchemaResolver.java on dev_4_4 with changes from develop'
  # PR 1372 ximenesuk 'Remove emanScripts tests'
  # PR 1374 snoopycrimecop 'Update dev_4_4 submodules'
Conflicting PRs (not included):
  # PR 1358 will-moore 'Selenium webclient setup 11314'
  # PR 1371 will-moore 'Selenium webclient create pd 11323'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 622 ctrueden 'Upgrade SLF4J to 1.7.2 [dev_4_4]'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 368 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 431 jburel 'Brew install'
  # PR 435 hflynn 'Permissions'

Generated by OMERO-merge-stable#325 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/325/)