Various fixes from CHS Pipeline

failed when using configfiles

changed milestone to %2.1.0

assigned to @schaefed

approved this merge request

enabled an automatic merge when the pipeline for aea31fc9 succeeds

merged

mentioned in commit 0104611d

mentioned in issue #347 (closed)

mentioned in commit 63b55c6d

mentioned in commit 684dc8a0

mentioned in commit 8f7a90e4