Rename test and helper classes to conform to pytest naming rules.
Merge pull request #1908 from ximenesuk/fix-skipped-test

Enable test_cmdcallback.py
Update develop submodules

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

Repository: openmicroscopy/bioformats
Updating e3f13fa..adfe6d7
Merged PRs (fast-forward):
  # PR 828 melissalinkert 'Update POM version numbers to 5.0.0-rc1'
  # PR 833 hflynn 'Removing 'in transition' banner from docs'
  # PR 829 hflynn 'Adding beta2 to version history'
  # PR 830 sbesson 'Add section about JVM memory settings under MATLAB'
  # PR 825 melissalinkert 'bfopen: store both the global and series metadata in the returned array'
  # PR 827 melissalinkert 'Update format pages for 5.0.0-beta2'
  # PR 818 melissalinkert 'Last round of fixes for Maven build system'
  # PR 819 melissalinkert 'Flex: map server-mapped files to the same directory as metadata files'
  # PR 820 joshmoore '7856 flim ann'
  # PR 824 melissalinkert 'Imspector: always set the modulo TypeDescription to "TCSPC"'
  # PR 823 melissalinkert 'Zeiss CZI: adjust for incorrectly recorded extra dimensions'
  # PR 822 melissalinkert 'ND2: prevent alpha component from being set to 0'
  # PR 810 melissalinkert 'Preserve lookup tables when exporting from ImageJ'
  # PR 807 melissalinkert 'CellWorx: ignore thumbnails and missing channel names (rebased onto develop)'
  # PR 804 melissalinkert 'Leica LIF: 'C' goes before other dimensions if SizeC and SizeT > 1'
  # PR 796 melissalinkert 'Zip: improve reader and handle performance'

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

Repository: openmicroscopy/ome-documentation
Updating 412e806..c5de70d
Merged PRs (fast-forward):
  # PR 593 hflynn 'Removing the 'in transition' banner from docs'
  # PR 584 manics 'Web config docs 11723 11724'
  # PR 590 hflynn '11802 fix - updating what's new for OMERO 5 docs'
  # PR 589 sbesson 'Add section about tag plugin in users CLI documentation'
  # PR 581 will-moore 'Doc running App from anywhere & CreateApp refactor'
  # PR 591 hflynn 'Removing reference to beta2'
  # PR 585 hflynn 'Removing swordfish as root password for VA (rebased onto develop)'
  # PR 573 sbesson 'Continous integration fixes'
  # PR 578 will-moore 'Django 1.6 for devs 11757'
  # PR 583 sbesson 'Improve description of CLI usage as a client'
  # PR 580 pwalczysko 'Exchange "Link" for user-friendlier "Mix data" cf. Gus's comment'
  # PR 582 will-moore 'update plugin options. See #11806'
  # PR 576 sbesson 'Review server upgrade and password provider pages'

Generated by OMERO-submods-develop#268 (http://hudson.openmicroscopy.org.uk/job/OMERO-submods-develop/268/)
Merge pull request #1888 from snoopycrimecop/merge/develop/submodules

Update develop submodules