Merge proposals dependent on lp://staging/~adreeve/backintime/samba_access

lp://staging/~adreeve/backintime/samba_access has no merge proposals.