Can this be merged in already? It's 2018....

In D10512#263482, @eric_metricspace.net wrote:

This one breaks up much easier, since it's mostly new code. Be aware, however, that the changes will introduce dead code until the GELI driver itself goes in.