Cu-Zn disorder in stoichiometric and non-stoichiometric Cu2ZnSnS4/Cu2ZnSnSe4