Na-ion mobility in layered Na2FePO4F and olivine Na[Fe,Mn]PO4