Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Revert "cleanup preseeding files and add customized LVM partitioning scheme"

This reverts commit 6494eb900d9fdf64ea58051e0578f8b505e86ed7.
soft-fail in case we already have an existing branch with that name
Merge branch 'hotfix/branch-handling' into develop