Merge pull request #2874 from joshmoore/rebased/develop/swap-jvmcfg

Swap jvmcfg (rebased onto develop)
Update develop submodules

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

Repository: openmicroscopy/bioformats
Updating 3b856bc..fd9850d
Merged PRs (fast-forward):
  # PR 1237 sbesson 'Prepend Maven central in the pluginRepositories block (rebased onto develop)'
  # PR 1210 melissalinkert 'Zeiss LSM: fix offset calculationg for > 4GB files with SizeT > 1'
  # PR 1220 emilroz 'Czi expand metadata to all the channels (rebased onto develop)'
  # PR 1200 melissalinkert 'Fix off-by-one in LZW decoding'
  # PR 1218 rleigh-dundee 'travis: Switch from raring to saucy'

Repository: ome/scripts
Updating 9771f00..87ca83d
Merged PRs (fast-forward):
  # PR 90 bpindelski 'Avoid division by 0 in Plot Profile. (rebased onto develop)'

Repository: openmicroscopy/ome-documentation
Updating ce96fa7..d3ad928
Merged PRs (fast-forward):
  # PR 920 aleksandra-tarkowska 'adding HTTPS server references (rebased onto develop)'
  # PR 916 bpindelski 'Further clarification of in-place on Windows. (rebased onto develop)'
  # PR 915 bpindelski 'Deprecate omero_client.jar. (rebased onto develop)'
  # PR 883 bpindelski 'Document client requirements for in-place import on Windows. (rebased onto develop)'
  # PR 913 sbesson 'Add switch-group info to user CLI page (rebased onto develop)'
  # PR 906 sbesson 'Fine tune config (rebased onto develop)'
  # PR 904 sbesson 'Update auto-generated properties'
  # PR 909 sbesson 'Remove limitations (rebased onto develop)'
  # PR 907 sbesson 'Breaking model (rebased onto develop)'
  # PR 908 sbesson 'Added documentation for Active Directory LDAP (rebased onto develop)'
  # PR 905 sbesson 'Adv config example (rebased onto develop)'
  # PR 887 sbesson '5.0.3: CLI documentation (rebased onto develop)'
  # PR 879 dpwrussell 'Added warning about web plugins to upgrade docs'
  # PR 891 sbesson 'Add travis_retry to sudo apt-get install commands in .travis.yml (rebased onto develop)'
  # PR 888 sbesson 'Expand setup.py test/py.test options description (rebased onto develop)'
  # PR 889 rleigh-dundee 'Update recommended PostgreSQL version to 9.2 for float bug fix'
  # PR 886 ximenesuk 'DropBox note (rebased onto develop)'
  # PR 890 joshmoore 'New search docs (rebased onto develop)'
  # PR 864 mtbc 'move %time% template expansion term to only user-owned (rebased from dev_5_0)'
  # PR 880 sbesson 'Release jobs redesign'
  # PR 878 sbesson 'Dco revert'
  # PR 874 mtbc 'add note about consequences of "damaging" in-place import files (rebased from dev_5_0)'
  # PR 882 sbesson 'OMERO.server properties: documentation template (rebased onto develop)'
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 869 joshmoore '12311 auto memory docs (rebased onto develop)'
  # PR 871 rleigh-dundee 'travis: Switch from raring to saucy'

Generated by OMERO-5.1-latest-submods#156 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-submods/156/)
Merge pull request #2882 from ximenesuk/rebased/develop/unsuppress-no-move

Unsuppress fs rename --no-move option. (rebased onto develop)
add API documentation note about checking existing hashes
Expose File-Size-64 checksum in the importer-cli advanced help
merge develop -D org: PR 2391 (Imagej omero (rebased onto develop))
merge develop -D org: PR 2435 (cpp: RTypesI: use static locals in place of duplicated globals)
merge develop -D org: PR 2747 (Bugfix: Saved by display)
merge develop -D org: PR 2795 (Use mklink under Windows (rebased onto develop))
merge develop -D org: PR 2797 (OmeroCpp: switch build system from SCons to CMake)
merge develop -D org: PR 2799 (Auto close (rebased onto develop))
merge develop -D org: PR 2809 (Update develop submodules)
merge develop -D org: PR 2830 (Show error message if group permission downgrade fails (rebased onto develop))
merge develop -D org: PR 2835 (Update OmeroPy/src/path.py)
merge develop -D org: PR 2847 (add file size hash; make image acquisition date optional)
merge develop -D org: PR 2863 (ensure that all hashers are supported by the server (rebased from dev_5_0))
merge develop -D org: PR 2870 (Remove useless image acquisition times)
merge develop -D org: PR 2871 (Add a quiet option to CLI commands (rebased onto develop))
merge develop -D org: PR 2875 (Matlab CZI job (rebased onto develop))
merge develop -D org: PR 2876 (fix #12494: prevent search result table crash in Insight (rebased from dev_5_0))