Merge pull request #3061 from joshmoore/2014-SV1+SV2-develop

2014 sv1+sv2 develop
add SQL action for translating user ID to name

(mirrors existing method)

Conflicts:
	components/model/resources/ome/util/actions/default.properties
make user ID -> name available through password utility class
automatically upgrade legacy passwords if possible
moving static values to options
Merge pull request #3033 from jburel/float-re

Float re
Merge pull request #3066 from ximenesuk/depersonalise-import-tests

De-personalise the path arguments in import unit test.
Remove doctest in favor of pytest
Update develop submodules

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

Repository: openmicroscopy/bioformats
Updating a9cad62..c298f2c
Previously merged:
  # PR 1359 snoopycrimecop 'Update auto-generated documentation'
  # PR 1351 melissalinkert 'ND2: reset series count before allocating offset array'
  # PR 1353 seb-berger 'KodakReader: Bugfix and file info metadata'
  # PR 1352 rleigh-dundee 'C++ TIFF tiling support'
  # PR 1328 sbesson 'Use in-place caching by default in Memoizer'
  # PR 1356 sbesson 'Re-order plugin repositories in format-bsd/pom.xml'
  # PR 1302 sbesson 'Add branch-specific link for downloading the JAR file if unfound (rebased onto develop)'
  # PR 1339 melissalinkert 'Amaris FlowSight'
  # PR 1315 LeeKamentsky 'IM3Reader for Perkin-Elmer Nuance'

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

Repository: openmicroscopy/ome-documentation
Updating 1cf122e..d1388f7
Previously merged:
  # PR 1000 sbesson 'Add extlink for security vulnerabilities pages (rebased onto develop)'
  # PR 999 snoopycrimecop 'Update auto-generated properties'
  # PR 991 aleksandra-tarkowska 'updating documentation to use new glosary'
  # PR 988 sbesson 'Property index'

Generated by OMERO-5.1-latest-submods#207 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-submods/207/)
Merge pull request #3064 from snoopycrimecop/develop/latest/submodules

Update develop submodules
adjust password test to expect automatic password upgrade
Fix OMERO.cpp integration tests

With the recent SV1+SV2 fix, users with empty passwords are disabled by
default. This commit fixes the OMERO C++ integration tests by using
createExperimentWithPassword to create users with a password equal to the
username and fixing the tests login().
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2895 (Reload groups after users added/removed)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2979 (Thumbnail cache busting)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3029 (OmeroCpp: Disable RMap and search tests)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3037 (Group sudo)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3039 (Float rendering web)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3043 (Flake8 various files under OmeroPy (part 2))
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3051 (Fixed quality initial selection on full-preview load)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3052 (UI support for floating point channel values)