Import new RTypes.ice file in rtypes.py
Preview panel toolbar buttons with text
Label rename 'User Settings'
updating references
adjustment to use new directive: property
Allow longer channel button names
Clearer when 'Save' button disabled
replacing term by the new property
Merge pull request #3022 from rleigh-dundee/cpp-integration

OmeroCpp: Export symbols needed by tests
Merge pull request #3021 from rleigh-dundee/findice-fixes

FindIce: Remove unneeded search path modification
rdef 'Paste' in Preview disabled if incompatible
indentation adjustment
Merge pull request #2982 from bpindelski/12530-inplace

Fix #12530: detect Windows if closing RFS.
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2835 (Update OmeroPy/src/path.py)
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 2926 (OmeroCpp: Glob test sources)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2927 (OmeroCpp: Glob example sources)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2965 (blitz: Split RObject out of RTypes)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2970 (Bugfixes for 5 0 4)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2979 (Thumbnail cache busting)