Long-range order and spin-liquid states of polycrystalline Tb2+xTi2-xO7+y