Merge proposals dependent on lp://staging/~cezary0/cryptsetup/bugfix474258_refactored

lp://staging/~cezary0/cryptsetup/bugfix474258_refactored has no merge proposals.