svn commit: r324298 - stable/11

[Konstantin Belousov]

Author: kib
Date: Thu Oct  5 10:47:04 2017
New Revision: 324298
URL: https://svnweb.freebsd.org/changeset/base/324298

Log:
  MFC r323722,324078:
  Record merge of r323722 and its revert r324078.

Modified:
Directory Properties:
  stable/11/   (props changed)