Fix dual dirs in the mac zip for insight

gh-1994 re-introduced importer-cli but at the same
time used `${main-dist-prefix}` rather than
`${dist.zip.prefix.osx}` leading to split directories.
basic planes matrix to compare with planes in webtest
Allow subset of all planes in matrix
adding search input field to the ome context
merge develop -D org -I include -E exclude: PR 1956 (Login button)
merge develop -D org -I include -E exclude: PR 1960 (Remove cut link 11882)
merge develop -D org -I include -E exclude: PR 1975 (Implemented a hash on BlitzGateway objects)
merge develop -D org -I include -E exclude: PR 2005 (assist #11091: refactor server DB queries for hierarchy navigation)
merge develop -D org -I include -E exclude: PR 2051 (Login redirects #hash. See #11957)
merge develop -D org -I include -E exclude: PR 2067 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 2072 (User menu display)
merge develop -D org -I include -E exclude: PR 2080 (Various import and logging fixes (rebased onto develop))
merge develop -D org -I include -E exclude: PR 2081 (Fix dual dirs in the mac zip for insight (rebased onto develop))
merge develop -D org -I include -E exclude: PR 2083 (Plane matrix test)
merge develop -D org -I include -E exclude: PR 2084 (addin search block to webadmin)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2036 joshmoore 'DSL Map Type' (exclude comment)
  # PR 1742 aleksandra-tarkowska '11591 user ip' (label: exclude)
  # PR 1385 manics 'Update the OMERO VirtualBox image' (exclude comment)
Already up-to-date.

Merged PRs:
  # PR 1956 jburel 'Login button'
  # PR 1960 will-moore 'Remove cut link 11882'
  # PR 1975 dpwrussell 'Implemented a hash on BlitzGateway objects'
  # PR 2005 mtbc 'assist #11091: refactor server DB queries for hierarchy navigation'
  # PR 2051 will-moore 'Login redirects #hash. See #11957'
  # PR 2067 snoopycrimecop 'Update develop submodules'
  # PR 2072 jburel 'User menu display'
  # PR 2080 ximenesuk 'Various import and logging fixes (rebased onto develop)'
  # PR 2081 joshmoore 'Fix dual dirs in the mac zip for insight (rebased onto develop)'
  # PR 2083 will-moore 'Plane matrix test'
  # PR 2084 aleksandra-tarkowska 'addin search block to webadmin'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 881 qidane 'New wavelength' (label: exclude)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
Updating df16d11..9d904fb
Merged PRs (fast-forward):
  # PR 872 melissalinkert 'UpgradeChecker: fix the stable version number (rebased onto develop)'

Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 859 melissalinkert 'Assorted metadata/tile parsing fixes'
  # PR 866 melissalinkert 'Update POMs to point to mirror of the cppwrap plugin (rebased onto develop)'
  # PR 884 rleigh-dundee 'Make a buildable source release'
  # PR 885 melissalinkert 'Correctly set Modulo annotations for multi-Image datasets'
  # PR 886 melissalinkert 'Flex: be more permissive in parsing IFDs and XML'
  # PR 891 melissalinkert 'Fix tiled TIFF reading and writing (rebased onto develop)'
  # PR 896 melissalinkert 'Initial version of bfCheckJavaMemory (rebased onto develop)'
  # PR 897 melissalinkert 'Implement pre-loading for .sdt files in the interest of performance. (rebased onto develop)'
  # PR 898 joshmoore 'Create bioformats_package.jar (rebased onto develop)'
  # PR 899 joshmoore 'Test compile targets with Travis (rebased onto develop)'

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

Merged PRs:
  # PR 60 will-moore 'Kymograph_Analysis creates single csv. See #11909'

Repository: openmicroscopy/ome-documentation
Updating 09e9abe..53cfaf4
Merged PRs (fast-forward):
  # PR 654 joshmoore '11955 loci-tools docs (rebased onto develop)'

Merged PRs:
  # PR 626 pwalczysko 'Add new Squash tutorial and screenshots'
  # PR 652 sbesson 'Improve server-template description in advanced configuration (rebased onto develop)'
  # PR 655 hflynn 'removing reference to FARSIGHT tutorial re:LOCI_tools'
  # PR 657 hflynn 'using latest-develop redirects for downloads (rebased onto develop)'

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