travis: Split python build into two steps
Merge pull request #2273 from joshmoore/rebased/develop/cli-bug-fixes

CLI bug fixes (rebased onto develop)
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 2207 (Implemented maximum file size limit for import)
merge develop -D org: PR 2235 (customizing 'Orphaned images' container)
merge develop -D org: PR 2240 (Search image id 12151)
merge develop -D org: PR 2248 (Update develop submodules)
merge develop -D org: PR 2253 (limit webtest getObjects() to 10)
merge develop -D org: PR 2256 (Tablet drag handling)
merge develop -D org: PR 2258 (Truncate js tree dynamically 12161)
merge develop -D org: PR 2261 (Remove duplicate setting of uint16 bit size)
merge develop -D org: PR 2268 (Remove last file annotation)
merge develop -D org: PR 2269 (ROI improvements)
merge develop -D org: PR 2272 (Login as cli (rebased onto develop))
merge develop -D org: PR 2276 (C++: fixes for clang)
merge develop -D org: PR 2277 (travis: Split build logic into a separate script)
merge develop -D org: PR 2280 (Fix indirect import in webgateway)
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2244 aleksandra-tarkowska 'Webstart access limited' (exclude comment)
  # PR 2128 jburel 'Open with develop' (label: exclude)
  # PR 2160 dominikl 'Warning dialog before deletion of linked images' (status: )
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users' (label: exclude)
  # PR 2270 will-moore 'Disk space 12126' (status: )
  # PR 2036 joshmoore 'DSL Map Type' (label: breaking)
Already up-to-date.

Merged PRs:
  # PR 2165 dominikl 'Inplace file path'
  # PR 2182 joshmoore 'Read only flag'
  # PR 2188 ximenesuk 'Close the RFS and kill the root session.'
  # PR 2207 dominikl 'Implemented maximum file size limit for import'
  # PR 2235 aleksandra-tarkowska 'customizing 'Orphaned images' container'
  # PR 2240 will-moore 'Search image id 12151'
  # PR 2248 snoopycrimecop 'Update develop submodules'
  # PR 2253 will-moore 'limit webtest getObjects() to 10'
  # PR 2256 will-moore 'Tablet drag handling'
  # PR 2258 will-moore 'Truncate js tree dynamically 12161'
  # PR 2261 melissalinkert 'Remove duplicate setting of uint16 bit size'
  # PR 2268 dominikl 'Remove last file annotation'
  # PR 2269 dominikl 'ROI improvements'
  # PR 2272 joshmoore 'Login as cli (rebased onto develop)'
  # PR 2276 rleigh-dundee 'C++: fixes for clang'
  # PR 2277 rleigh-dundee 'travis: Split build logic into a separate script'
  # PR 2280 knabar 'Fix indirect import in webgateway'

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 999 melissalinkert 'Fix for single channel  meas_mode 13 data (rebased onto develop)'
  # PR 1014 bpindelski 'Add initial structure for decompressing JPEG XR images (assist #8493).'
  # PR 1028 melissalinkert 'Large fileset performance improvements (rebased onto develop)'
  # PR 1029 melissalinkert 'TIFF: adjust optimal tile height if tiles have height of 1 (rebased onto develop)'
  # PR 1030 melissalinkert 'CZI: restrict dimension adjustment (rebased onto develop)'
  # PR 1031 melissalinkert 'Volocity: parse timestamps from .atsf files (rebased onto develop)'
  # PR 1041 melissalinkert 'Minor docs autogen fixes (rebased onto develop)'
  # PR 1042 melissalinkert 'OME-XML package bug-fix (rebased onto develop)'
  # PR 1043 rleigh-dundee 'xsd-fu: Remove continued line inside genshi conditionals'

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

Repository: openmicroscopy/ome-documentation
Updating 803da1a..6c60e92
Merged PRs (fast-forward):
  # PR 729 sbesson 'Add page for Consortium CI jobs'

Merged PRs:
  # PR 733 ximenesuk 'Clarify location and group for DropBox imports. (rebased)'
  # PR 734 hflynn 'Improvements to import scenarios (rebased onto develop)'

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