Updating to use holidays that are explicitly set in calendar_dates.txt
Merge branch 'dev'