bug fix for 7987
Merge pull request #7988 from MichaelWS/master

bug fix for 7987 and add day of week functionality to Holiday