Merge branch 'pre-merge' into '3.6.5'

# Conflicts:
#   CHANGELOG.md
#   configure/CONFIG_MODULE
#   llrfsystem.Makefile
#   llrfsystem/iocsh/octopus.iocsh
6 jobs for 3.6.5 in 1 minute and 52 seconds (queued for 4 seconds)