[540812] Tweaking formatting, versions, and non-nls markers.
7 files changed