[PATCH 01/13] Apparently necessary kpartx changes (#867593)