Integration mk2

[joshmoore]

see https://github.com/openmicroscopy/openmicroscopy/pull/5787

[joshmoore]

see @manics comment from https://github.com/openmicroscopy/openmicroscopy/pull/5807#issuecomment-402977879

[joshmoore]

@sbesson @jburel : would like to try getting this in with 5787 now. I'll do some more testing and rollback SECLEVEL as necessary.

[joshmoore]

Rolled back SECLEVEL since https://github.com/openmicroscopy/openmicroscopy/pull/5830 is green.

I'm still testing the following locally:

+        srvup)
+            export COMPONENT=server
+            export USER=omero-server
+            export CID="$PROJECT"_omero_1
+            export COMPOSE_FILE=${COMPOSE_FILE:-"srv-compose.yml"}
+            export OMERO_DIST="/opt/omero/server/OMERO.server"
+            export TARGET=/src
+            export NOCLEAN=true
+            start_up
+            install --nosrc
+            run py common
+            ;;
+        srvdown)
+            export COMPONENT=server
+            export USER=omero-server
+            export CID="$PROJECT"_omero_1
+            export COMPOSE_FILE=${COMPOSE_FILE:-"srv-compose.yml"}
+            export OMERO_DIST="/opt/omero/server/OMERO.server"
+            export TARGET=/src
+            export NOCLEAN=true
+            $ACTION .omero/compose down -v
+            ;;

but considering there are blatant mistakes in the current version, I'd suggest we get this in.