Changes to calendar function.
Merge pull request #230 from roydude/v1-train

Changes to calendar function.
Merge branch 'v1-train' of https://github.com/owdqa/owd_test_cases into v1-train
26402 and 26797 updated