Merge proposals dependent on lp:~gz/bzr/smart_add_former_file_dir_251864

lp:~gz/bzr/smart_add_former_file_dir_251864 has no merge proposals.