PLAT-6802 - Enhance performance of MasterHolidaySource

Fixup from PR