adding FORCE_SCRIPT_NAME to the settings.py close #11723
adding support for FORCE_SCRIPT_NAME in nginx config
Merge pull request #1813 from knabar/import-omeroweb-apps-from-pythonpath-dev_4_4

dev_4_4: Don't require additional omeroweb apps to be within omeroweb
Merge pull request #1828 from sbesson/rebased/dev_4_4/cliunittest

Unit tests (CLI tests flake8 and Travis fix) (rebased onto dev_4_4)
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 dev_4_4 -D org -I include -E exclude: PR 1690 (Webfigure TEMP)
merge dev_4_4 -D org -I include -E exclude: PR 1781 (Webstart popup windows 11656)
merge dev_4_4 -D org -I include -E exclude: PR 1799 (Fix intermittent test failures in OmeroPy-integration-stable.)
merge dev_4_4 -D org -I include -E exclude: PR 1805 (Upgrade ICE jars to version 3.5.1 (4.4))
merge dev_4_4 -D org -I include -E exclude: PR 1819 (Update dev_4_4 submodules)
merge dev_4_4 -D org -I include -E exclude: PR 1823 (Initialize table before file chooser.)
merge dev_4_4 -D org -I include -E exclude: PR 1827 (ldap discover username/password fix, paging and dn check (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1831 (fix #10581: getTile byte-ordering issue (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1833 (Add annotation ID to FileAnnotation tooltip in OMERO.insight (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1834 (#11723 adding FORCE_SCRIPT_NAME to the settings.py (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1835 (Simplify Travis environments (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude

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

Merged PRs:
  # PR 1690 will-moore 'Webfigure TEMP'
  # PR 1781 will-moore 'Webstart popup windows 11656'
  # PR 1799 bpindelski 'Fix intermittent test failures in OmeroPy-integration-stable.'
  # PR 1805 rleigh-dundee 'Upgrade ICE jars to version 3.5.1 (4.4)'
  # PR 1819 snoopycrimecop 'Update dev_4_4 submodules'
  # PR 1823 jburel 'Initialize table before file chooser.'
  # PR 1827 dpwrussell 'ldap discover username/password fix, paging and dn check (rebased onto dev_4_4)'
  # PR 1831 ximenesuk 'fix #10581: getTile byte-ordering issue (rebased onto dev_4_4)'
  # PR 1833 sbesson 'Add annotation ID to FileAnnotation tooltip in OMERO.insight (rebased onto dev_4_4)'
  # PR 1834 aleksandra-tarkowska '#11723 adding FORCE_SCRIPT_NAME to the settings.py (rebased onto dev_4_4)'
  # PR 1835 sbesson 'Simplify Travis environments (rebased onto dev_4_4)'

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

Merged PRs:
  # PR 808 hflynn 'Tidying ITK user doc page'

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

Merged PRs:
  # PR 53 will-moore 'Initial commit of Figure_To_Pdf.py'

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

Merged PRs:
  # PR 559 mtbc 'remind that model changes may affect IceMapper (rebased)'
  # PR 560 hflynn 'Adding ILdap as requested by Ola'

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