svn commit: r331685 - stable/11

[Kyle Evans]

Author: kevans
Date: Wed Mar 28 16:48:26 2018
New Revision: 331685
URL: https://svnweb.freebsd.org/changeset/base/331685

Log:
  Record-only MFC of r330252, r330253
  
  r330253 reverted r330252, which was committed with nothing but the message:
  "MFC After: 1 week"
  
  Go ahead and record the merge of both of them. r330254 was the follow-up
  commit with the same contents as r330252 but with an appropriate message. It
  will be MFC'd along with the introduction of the corresponding options as
  appropriate.

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