Merge pull request #609 from bpindelski/rebased/develop/10095_admin_sc

Improvements to windows service user (see #10095) (rebased onto develop)
Temporary workaround for PixelData for repo != null

Similar to 6fcb6afa7ab, the loading of pixels by the
PixelData process was also explicitly filtering any
pixels for which the repo value was non-null. This
commit removes that restriction temporarily. This has
the side-effect of limiting FS to a single server, but
should work for the moment.
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 577 (9821 Major FS refactoring)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 587 (Modulo retrieve (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 592 (C++ fixes for building with Ice >= 3.4)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 599 (scons: Update to version 2.2.0)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 602 (Roi test develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 606 (Jshint compliance 9927 (develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 577 joshmoore '9821 Major FS refactoring'
  # PR 587 jburel 'Modulo retrieve (rebased onto develop)'
  # PR 592 rleigh-dundee 'C++ fixes for building with Ice >= 3.4'
  # PR 599 rleigh-dundee 'scons: Update to version 2.2.0'
  # PR 602 jburel 'Roi test develop'
  # PR 606 will-moore 'Jshint compliance 9927 (develop)'

Repository: openmicroscopy/bioformats
Updating 55cf7fd..221be61
Merged PRs:
  # PR 340 melissalinkert 'Use better schema documentation links (rebased onto develop)'
  # PR 341 melissalinkert 'Docs enhancements (rebased onto develop)'
  # PR 344 melissalinkert 'Sprint4.2 bug fixes develop'

Repository: ome/scripts
Updating 457e85a..272c83a

Repository: openmicroscopy/ome-documentation
Updating 2e32665..e38561d
Merged PRs:
  # PR 210 bpindelski 'Update Windows docs (see #10095) (rebased onto develop)'
  # PR 211 hflynn 'Sysadmin docs tidy (rebased onto develop)'

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