Two-dimensional quasi-linear evolution of the electron-beam-plasma instability