more thorough extend/merge, notably for master_dir across Theory.join_theory (e.g. for file antiquotation);