Taking a Haircut on Erev Shabbos When Lag BaOmer Falls on Sunday

Haircutting and shaving on erev Shabbos when Lag BaOmer falls on Sunday. Is it permitted to take a haircut on Thursday night? On Motzai Shabbos? SOurces can be found here.