undo cms date format templates changes
Merge branch 'ok-merge-from-master' of https://github.com/morenopc/edx-platform into ok-merge-from-master