Accurate TD-DFT calculations of near-edge x-ray and optical absorption spectra of liquid water using non-periodic boundary conditions: The role of self-interaction and long-range effects