Valera/fix start time end time 2

Work in progress.

[BLD-529](https://edx-wiki.atlassian.net/browse/BLD-529)