K 10 svn:author V 3 ian K 8 svn:date V 27 2015-02-13T20:05:37.108704Z K 7 svn:log V 196 MFC r263245, r269233, r267101, r275961: Config style cleanups. Some of these are effectively record-only merges, because the actual merge happened during conflict resolution of some prior merge. END