Strong enhancement of superconductivity at high pressures within the charge-density-wave states of 2H-TaS2 and 2H-TaSe2