fixing custom template tag for retrieving settings

to display empty string instead of None
merge develop -D org: PR 1960 (Remove cut link 11882)
merge develop -D org: PR 2127 (Working view to email announcements to selected users, groups, email addresses and/or all users)
merge develop -D org: PR 2160 (Warning dialog before deletion of linked images)
merge develop -D org: PR 2165 (Inplace file path)
merge develop -D org: PR 2182 (Read only flag)
merge develop -D org: PR 2188 (Close the RFS and kill the root session.)
merge develop -D org: PR 2204 (Workaround for Java 7 bug)
merge develop -D org: PR 2207 (Implemented maximum file size limit for import)
merge develop -D org: PR 2229 (Webclient 'Apply owner's rdef' see #12044)
merge develop -D org: PR 2235 (customizing 'Orphaned images' container)
merge develop -D org: PR 2237 (fix #11965: join images to plate runs for leaf queries (rebased from dev_5_0))
merge develop -D org: PR 2240 (Search image id 12151)
merge develop -D org: PR 2243 (omeroweb flake8 cleanup: unused imports)
merge develop -D org: PR 2244 (Webstart access limited)
merge develop -D org: PR 2248 (Update develop submodules)
merge develop -D org: PR 2249 (omeroweb flake8 cleanup: Remove unused variables)
merge develop -D org: PR 2253 (limit webtest getObjects() to 10)
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2254 jburel 'Remove Empty menu. (see #12157) (rebased onto develop)' (status: failure)
  # PR 2251 knabar 'omero gateway flake8 cleanup: Fix failures and warnings' (status: failure)
  # PR 2128 jburel 'Open with develop' (label: exclude)
  # PR 2036 joshmoore 'DSL Map Type' (label: breaking)
Already up-to-date.

Merged PRs:
  # PR 1960 will-moore 'Remove cut link 11882'
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users'
  # PR 2160 dominikl 'Warning dialog before deletion of linked images'
  # PR 2165 dominikl 'Inplace file path'
  # PR 2182 joshmoore 'Read only flag'
  # PR 2188 ximenesuk 'Close the RFS and kill the root session.'
  # PR 2204 dominikl 'Workaround for Java 7 bug'
  # PR 2207 dominikl 'Implemented maximum file size limit for import'
  # PR 2229 will-moore 'Webclient 'Apply owner's rdef' see #12044'
  # PR 2235 aleksandra-tarkowska 'customizing 'Orphaned images' container'
  # PR 2237 mtbc 'fix #11965: join images to plate runs for leaf queries (rebased from dev_5_0)'
  # PR 2240 will-moore 'Search image id 12151'
  # PR 2243 knabar 'omeroweb flake8 cleanup: unused imports'
  # PR 2244 aleksandra-tarkowska 'Webstart access limited'
  # PR 2248 snoopycrimecop 'Update develop submodules'
  # PR 2249 knabar 'omeroweb flake8 cleanup: Remove unused variables'
  # PR 2253 will-moore 'limit webtest getObjects() to 10'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1002 qidane 'Adding a Map type and MapAnnotation' (label: breaking)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 981 melissalinkert 'Ignore namespaces when filling in an XMLAnnotation's Value'
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)'
  # PR 985 qidane 'Updating transform catalog for 2013-10-dev-1'
  # PR 990 melissalinkert 'Memoization fixes (rebased onto develop)'
  # PR 991 melissalinkert 'Only add a MetadataOnly element if no TiffData elements are present'
  # PR 999 melissalinkert 'Fix for single channel  meas_mode 13 data (rebased onto develop)'
  # PR 1001 qidane 'New time docs and samples'
  # PR 1004 bpindelski 'Update docs regarding BF and Eclipse (see #12127). (rebased onto develop)'
  # PR 1005 melissalinkert 'ND2: always set the field index to 2 (rebased onto develop)'
  # PR 1006 melissalinkert 'Read internal pyramids from CellSens .vsi data (rebased onto develop)'
  # PR 1007 melissalinkert 'SVS import and TIFF export fixes (rebased onto develop)'
  # PR 1008 melissalinkert 'Enable SDT plane preloading by default (rebased onto develop)'
  # PR 1010 rleigh-dundee 'C++ fixes and test improvements'
  # PR 1014 bpindelski 'Add initial structure for decompressing JPEG XR images (assist #8493).'

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

Repository: openmicroscopy/ome-documentation
Updating 7e0a9e3..93dcbe7
Merged PRs (fast-forward):
  # PR 718 rleigh-dundee 'Install cleanup (develop)'

Merged PRs:
  # PR 626 pwalczysko 'Add new Squash tutorial and screenshots'
  # PR 720 aleksandra-tarkowska 'Session engine update (rebased onto develop)'

Generated by OMERO-5.1-merge-push#135 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/135/)