Backported patches to DD4hep master

Incorporate critical patches to DD4hep (back ported from master):

• https://github.com/AIDASoft/DD4hep/pull/849
• https://github.com/AIDASoft/DD4hep/pull/851

.gitlab-ci.yml

@@ -179,7 +179,7 @@ jug_dev:default:
     - cp -r spack containers/jug
     - cp -r spack.yaml containers/jug/spack/spack.yaml
     ## Optionally build the raw builder image
-    - [ ${EXPORT_BUILDER} = 1 ] && docker build 
+    - test ${EXPORT_BUILDER} = 1 && docker build 
                    -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:builder-${INTERNAL_TAG} 
                    --target=builder
                    -f containers/jug/dev.Dockerfile
@@ -197,7 +197,7 @@ jug_dev:default:
                    --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
                    containers/jug
     ## push builder image do DH if desired
-    - [ ${EXPORT_BUILDER} = 1 ] && ./gitlab-ci/docker_push.sh 
+    - test ${EXPORT_BUILDER} = 1 && ./gitlab-ci/docker_push.sh 
                                  -i ${BUILD_IMAGE} -l builder-${INTERNAL_TAG}
                                  -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
                                  builder-${EXPORT_TAG} --dockerhub