When did the unification complete of all the Canadian forces to be called the French Army?