The Maxwellian plus water-bag model: application to the propagation of longitudinal electron waves in a plasma with Maxwellian and mono-energetic supra-thermal electrons