Resolved conflicts

Merge branch 'master' into 'master'

# Conflicts:
#   .gitlab-ci.yml
#   99-Shared/adsis8300bpm/aiChannelItem.bob
#   99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
#   99-Shared/adsis8300bpm/bpmChannelItem.bob

.gitlab-ci.yml

-include: 'https://gitlab.esss.lu.se/ics-infrastructure/gitlab-ci-yml/raw/master/PhoebusOpis.gitlab-ci.yml'
+---
+include:
+      - remote: 'https://gitlab.esss.lu.se/ics-infrastructure/gitlab-ci-yml/raw/master/PhoebusOpis.gitlab-ci.yml'