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

*** 20,39 ****
   */
  
  /*
   * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
-  * Copyright 2017 Joyent, Inc.
-  *
   */
  
  /*
   * Copyright (c) 1983,1984,1985,1986,1987,1988,1989  AT&T.
   * All rights reserved.
   */
  
  /*
   * Copyright 2018 Nexenta Systems, Inc.
   */
  
  #include <sys/types.h>
  #include <rpc/types.h>
--- 20,38 ----
   */
  
  /*
   * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
  /*
   * Copyright (c) 1983,1984,1985,1986,1987,1988,1989  AT&T.
   * All rights reserved.
   */
  
  /*
+  * Copyright 2017 Joyent, Inc.
   * Copyright 2018 Nexenta Systems, Inc.
   */
  
  #include <sys/types.h>
  #include <rpc/types.h>