Merge branch 'wip/feature/11979-additional-disk-for-apt-cacher-ng' into wip/feature/11972-11979-vagrant