Merge proposals dependent on lp:~elambert/drizzle/remove_rm_dir_symlink

lp:~elambert/drizzle/remove_rm_dir_symlink has no merge proposals.