Clean up merge problems with illumos#11083 (nfs-zone)

*** 19,29 ****
   * CDDL HEADER END
   */
  
  /*
   * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
-  * Copyright (c) 2015 Joyent, Inc.  All rights reserved.
   * Copyright (c) 2015 by Delphix. All rights reserved.
   * Copyright (c) 2015 Joyent, Inc.  All rights reserved.
   * Copyright 2018 Nexenta Systems, Inc. All rights reserved.
   */
  
--- 19,28 ----