Merge pull request #597 from rleigh-dundee/icecpp-dev44

C++ fixes for building with Ice >= 3.4 (dev_4_4)
Use local rather than hard-coded Homebrew dependencies script

With the scc merge command being used in OMERO-homebrew, this commit allows this job to test changes opened against omero_homebrew.sh
Add explicit path for omero_homebrew.sh
Merge pull request #644 from jburel/list-sorting

Fix sorting of container list (see #10242)
xsd-fu: Import changes from schema-2012-06
xsd-fu: Add new templates from schema-2012-06
xsd-fu: Update licence of generated OmeroMetadata.java to GPL2
Merge pull request #653 from joshmoore/homebrew-pwd

Homebrew pwd
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 558 (Plugin dependencies)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 575 (Handle internal SecurityViolation in openTable #10049)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 616 (render_fs_speed_10183)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 620 (Spec clean on dev 4 4)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 639 (Web bugs jan22nd)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 647 (xsd-fu cleanup (dev_4_4))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 648 (OmeroCpp: Add .exe as an executable extension only on Windows (dev_4_4))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 650 (Handle correctly duplicate thumbnails (see #10225) (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 656 (Merge xsd-fu changes from schema-2012-06 (dev_4_4))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 558 jburel 'Plugin dependencies'
  # PR 575 manics 'Handle internal SecurityViolation in openTable #10049'
  # PR 616 will-moore 'render_fs_speed_10183'
  # PR 620 qidane 'Spec clean on dev 4 4'
  # PR 639 will-moore 'Web bugs jan22nd'
  # PR 647 rleigh-dundee 'xsd-fu cleanup (dev_4_4)'
  # PR 648 rleigh-dundee 'OmeroCpp: Add .exe as an executable extension only on Windows (dev_4_4)'
  # PR 650 jburel 'Handle correctly duplicate thumbnails (see #10225) (rebased onto dev_4_4)'
  # PR 656 rleigh-dundee 'Merge xsd-fu changes from schema-2012-06 (dev_4_4)'

Repository: openmicroscopy/bioformats
Updating 03770c0..f8af208
Merged PRs:
  # PR 352 melissalinkert 'Add reader for TIFF files produced by Slidebook'

Repository: ome/scripts
Updating 3587c87..f1abf9e
Merged PRs:
  # PR 18 will-moore 'Split view merged 10109'

Repository: openmicroscopy/ome-documentation
Updating 858e9f2..982b908
Merged PRs:
  # PR 224 gusferguson 'Training material'
  # PR 227 joshmoore 'Add sections on locking and remote shares to unix/windows'
  # PR 231 sbesson 'Migrate the VM installation instructions to the Sphinx documentation'

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