K 10 svn:author V 5 markj K 8 svn:date V 27 2015-06-07T20:10:11.127402Z K 7 svn:log V 141 MFC r278136, r278137, r278370: Diff reduction with illumos, in preparation for merging r266993 from the vendor branch. No functional change. END