4 3 4 hotfixes

[will-moore]

A couple of bug fixes

[chris-allan]

@will-moore, @aleksandra-tarkowska: Do we want to merge this now or wait until we've got a few more changes to merge in?

[jburel]

@will-moore: it will be better to use ORIGINALMETADATA from constants.annotation than the original_metadata string cf. dfa4c05

[jburel]

@will-moore: in order to test that branch you will have to fix the merge conflict. Could you take care of that so we look at that PR?

[will-moore]

I tried following the steps on UsingGit page to fix the merge conflict, but no merge conflict was flagged:

jrs-macbookpro-25107:OMERO will$ git branch -D 4-3-4-hotfixes
Deleted branch 4-3-4-hotfixes (was 241217c).
jrs-macbookpro-25107:OMERO will$ git fetch origin
jrs-macbookpro-25107:OMERO will$ git checkout -b 4-3-4-hotfixes origin/develop
Branch 4-3-4-hotfixes set up to track remote branch develop from origin.
Switched to a new branch '4-3-4-hotfixes'
jrs-macbookpro-25107:OMERO will$ git pull gh 4-3-4-hotfixes
From github.com:will-moore/openmicroscopy

• branch 4-3-4-hotfixes -> FETCH_HEAD
  Auto-merging components/tools/OmeroWeb/omeroweb/webgateway/static/webgateway/js/3rdparty/panojs/control_thumbnail.js
  Auto-merging components/tools/OmeroPy/src/omero/gateway/init.py
  Auto-merging components/tools/OmeroPy/scripts/omero/figure_scripts/ROI_Split_Figure.py
  Auto-merging components/tools/OmeroPy/scripts/omero/export_scripts/Make_Movie.py
  Merge made by the 'recursive' strategy.
  .../omero/export_scripts/Batch_Image_Export.py | 2 +-
  .../scripts/omero/export_scripts/Make_Movie.py | 8 ++++----
  .../omero/figure_scripts/ROI_Split_Figure.py | 15 ++++++++-------
  .../tools/OmeroPy/src/omero/gateway/init.py | 2 +-
  .../js/3rdparty/panojs/control_thumbnail.js | 2 ++
  5 files changed, 16 insertions(+), 13 deletions(-)
  jrs-macbookpro-25107:OMERO will$

[jburel]

@will-moore, @chris-allan, @joshmoore: merge locally and no conflicts. Tested by will and chris and nobody had issues.

[jburel]

@will-moore, @chris-allan, @joshmoore: probably too old in history, I created a new branch from develop and cherry-picked the commits.
The PR #53 can be merged automatically.

[chris-allan]

All looking good. Merging.