Merge proposals dependent on lp://staging/~mterry/ecryptfs/error-bugs

lp://staging/~mterry/ecryptfs/error-bugs has no merge proposals.