Make sure to always umount at the end.
Silently set new config symbols to their defaults.
Merge branch 'master' into xenserver