Merge branch 'ACTS-402_cylinderVolumeBuilder' into 'master'

ACTS-402_cylinderVolumeBuilder

See merge request !372 (merged)

(cherry picked from commit 9cd9ada5)

e15eea41 Create container volume also if no inner volume is present 4eef95c9 Create new wrapping condition, in case no wrapping is needed