Merge proposals dependent on lp://qastaging/~mterry/lightdm/ecryptfs

lp://qastaging/~mterry/lightdm/ecryptfs has no merge proposals.