adding FORCE_SCRIPT_NAME to the settings.py close #11723
Add annotation ID to FileAnnotation tooltip in OMERO.insight
fix integration.test_icontainer.testGetImagesBySplitFilesetsManyCases

assists ticket #11610
adding support for FORCE_SCRIPT_NAME in nginx config
Remove netcdf-4.0.jar

With this jar removed, the build system will pick up netcdf
from the bio-formats submodule where the version has been
bumped to 4.3.19.

--depends-on openmicroscopy/bioformats#790
--no-rebase
Simplify Travis environments

- Remove cpp build as it reaches the timeout limit too often
- Use build-default rather than build-all
- Do not run test-compile as part of the py BUILD
Merge pull request #1817 from mtbc/trac-11610-fix-test_icontainer

fix integration.test_icontainer.testGetImagesBySplitFilesetsManyCases
Merge pull request #1808 from sbesson/fa_extended_metadata_insight

Add annotation ID to FileAnnotation tooltip in OMERO.insight
Merge pull request #1798 from aleksandra-tarkowska/11723_relative_path_deployment

#11723 adding FORCE_SCRIPT_NAME to the settings.py
Merge pull request #1826 from joshmoore/netcdf-update

Remove netcdf-4.0.jar
Update develop submodules

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

Repository: openmicroscopy/bioformats
Updating b97a992..e9c850d
Merged PRs (fast-forward):
  # PR 775 melissalinkert 'Add JWlz to Ivy dependencies'
  # PR 806 joshmoore 'Add planeInfo=true support to FakeReader (rebased onto develop)'
  # PR 788 melissalinkert 'Do not prompt to update to the latest stable version if Fiji is used'
  # PR 774 tinevez 'A reader for the Yokagawa Cellvoyager automated microscope.'
  # PR 790 melissalinkert 'Update netCDF to 4.3.19'
  # PR 767 melissalinkert 'Fix Channel.Color interpretation in ImageJ'
  # PR 791 melissalinkert 'Add support for PCORAW data'
  # PR 805 sbesson 'Revert "travis: Build with OpenJDK8"'
  # PR 801 mtbc 'fix link to Java Image I/O guide'
  # PR 797 melissalinkert 'Zeiss CZI: fix image reading for linescan images'
  # PR 800 melissalinkert 'Cellworx: fix off-by-one if all pixels files are missing'
  # PR 799 hflynn 'Fixing & adding links to contributing devs docs'
  # PR 798 rleigh-dundee 'travis: Build with OpenJDK8'
  # PR 792 melissalinkert 'Metamorph: make certain that the reader is closed when openBytes returns (rebased onto develop)'
  # PR 783 melissalinkert 'Leica LIF: do not set the 'rgb' flag for 16-bit multi-channel data'

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

Repository: openmicroscopy/ome-documentation
Updating 466262b..d07020b
Merged PRs (fast-forward):
  # PR 554 joshmoore '11607 scripts docs'
  # PR 553 hflynn 'Moving contributor developer documentation to top level'
  # PR 556 sbesson 'Fix installation link for Homebrew (rebased onto develop)'

Generated by OMERO-submods-develop#248 (http://hudson.openmicroscopy.org.uk/job/OMERO-submods-develop/248/)
Merge pull request #1810 from snoopycrimecop/merge/develop/submodules

Update develop submodules
Merge pull request #1830 from sbesson/travis_env

Simplify Travis environments