Update UnitsBased for proper enums
Merge pull request #3189 from joshmoore/units-fixes

Various minor fixes for units
Avoid GCC errors for earlier versions

The pragma statements produce warnings under, e.g.,
GCC 4.4.7. Since they are intended to **reduce**
noise, disable pushing/popping until 4.6.
Use enums name in namespace

At least for GCC 4.4, the enumeration can only
be found at omero::model::enums and not at
omero::model::enums::UnitsLength
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3037 (Group sudo)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3069 (Scalebar)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3109 (Disable keyboard navigation (up, down, left, right) for jquery tabs)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3133 (General Pane alignment)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3142 (Deprecate  methods/services)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3148 (Rnd rgb)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3155 (Re changes)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3156 (Templates cleanup)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3157 (Reset password)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3160 (Try search repeatedly until success)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3175 (General pane web)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3188 (Webtest removal)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3190 (Insight units)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3194 (Tables metadata check size after close)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3195 (Units cpp fixes)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 3000 jballanc 'Update artifacts for Lucene, Hibernate, and Spring' (user: jballanc)
  # PR 3193 ximenesuk 'Add DN for groups (fix #6719).' (exclude comment)
  # PR 3042 will-moore 'Download dataset project' (label: exclude)
  # PR 2182 joshmoore 'Read only flag' (label: exclude)
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
  # PR 2363 dominikl 'Java Gateway API' (label: exclude breaking)
  # PR 3141 dpwrussell 'jstree upgrade (Functionality Review Only)' (exclude comment)
  # PR 3196 will-moore 'Units fixes web' (status: failure)
  # PR 3086 will-moore 'Create image by tiling 12459' (label: exclude)
  # PR 3181 joshmoore 'Update to Hibernate 3.6 (See trac2570)' (label: exclude breaking)
  # PR 3098 aleksandra-tarkowska 'Metadata reimport' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 3037 joshmoore 'Group sudo'
  # PR 3069 aleksandra-tarkowska 'Scalebar'
  # PR 3109 dpwrussell 'Disable keyboard navigation (up, down, left, right) for jquery tabs'
  # PR 3133 dominikl 'General Pane alignment'
  # PR 3142 jburel 'Deprecate  methods/services'
  # PR 3148 jburel 'Rnd rgb'
  # PR 3155 jburel 'Re changes'
  # PR 3156 aleksandra-tarkowska 'Templates cleanup'
  # PR 3157 jburel 'Reset password'
  # PR 3160 ximenesuk 'Try search repeatedly until success'
  # PR 3175 will-moore 'General pane web'
  # PR 3188 will-moore 'Webtest removal'
  # PR 3190 dominikl 'Insight units'
  # PR 3194 manics 'Tables metadata check size after close'
  # PR 3195 joshmoore 'Units cpp fixes'
Conflicting PRs (not included):
  # PR 3187 will-moore '5 0 6 rebase'
Conflicting branches (not included):
  # jburel:qa-submit-new

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1309 melissalinkert 'Allow tile-based access of large JPEG-2000 images' (exclude comment)
  # PR 1418 rleigh-dundee 'IFormatReader: Remove deprecated methods' (exclude comment)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 1381 melissalinkert 'Parse physical pixel sizes from CellSens .vsi datasets' (label: exclude)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1383 LeeKamentsky 'Fix im3 metadata' (user: LeeKamentsky)
  # PR 1421 jburel 'Units mock' (status: failure)
  # PR 1362 melissalinkert 'Make FormatReader's RandomAccessInputStream transient' (label: breaking)
  # PR 1365 ctrueden 'PrairieView 5.2 fixes and improvements' (label: exclude)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 1366 ctrueden 'Miscellaneous cleanup' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 1385 rleigh-dundee 'C++: Add TIFF reader'
  # PR 1407 melissalinkert 'TIFF: fix plane count calculation for pyramids with multiple planes'
  # PR 1419 sbesson 'Flake8 Bio-Formats Python files'
  # PR 1420 qidane 'Updating samples and adding units samples'

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

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

Merged PRs:
  # PR 990 kennethgillen 'for users who have compiled isapi_wsgi on x64'

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