client.cpp: fix copyright header
client.cpp: fix whitespace
client.cpp: set default encoding in Ice 3.5
client.py: set default encoding in Ice 3.5
client.{java,py}: >= for intVersion check
client.java: fix whitespace
client.java: fix copyright header
make tree popup menu item tester able to use submenus
fix context menu checking according to changes in Insight itself
Merge pull request #1605 from jburel/well-annotation

Well annotation
Merge pull request #1567 from snoopycrimecop/merge/dev_4_4/submodules

Update dev_4_4 submodules
merge dev_4_4 -D org -I include -E exclude: PR 1601 (Fix the "integration" target in components/rendering.)
merge dev_4_4 -D org -I include -E exclude: PR 1602 (Ice default encoding)
merge dev_4_4 -D org -I include -E exclude: PR 1604 (fix #11446: add robot framework scripts for testing the Insight data browser)
merge dev_4_4 -D org -I include -E exclude: PR 1606 (fix #11518: update Insight UI context menu tests)
merge dev_4_4 -D org -I include -E exclude

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

Merged PRs:
  # PR 1601 bpindelski 'Fix the "integration" target in components/rendering.'
  # PR 1602 joshmoore 'Ice default encoding'
  # PR 1604 mtbc 'fix #11446: add robot framework scripts for testing the Insight data browser'
  # PR 1606 mtbc 'fix #11518: update Insight UI context menu tests'

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

Merged PRs:
  # PR 673 melissalinkert 'Make configuration file suffix configurable'
  # PR 710 melissalinkert 'Data test updates (rebased onto dev_4_4)'
  # PR 727 melissalinkert 'Data tests: adjust memory calculations based upon thread count (rebased onto dev_4_4)'
  # PR 728 melissalinkert 'bfconvert: fix conversion of individual series'

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

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

Merged PRs:
  # PR 503 hflynn 'Removing users from main docs'
  # PR 507 ximenesuk 'Document pytest on developer testing page'

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