Resurrect LUKS code which was previously merged+reverted.
Revert "Revert "Merge branch 'luks-decorator'""
This reverts commit 6806de6fb75d5a1227a1ffda0d2e2ef589e367f0.