* commit 'e5032c42da3c33a854df0a24a7968b4ab54190b9': Changes to encryption to work with the new filesystem manager