Merge change 7166 into donut

* changes:
  Fix a few date format strings to put backslashes in front of apostrophes.