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

*** 458,467 ****
--- 458,468 ----
          struct nlm_host_list            nlm_idle_hosts;         /* (z) */
          struct nlm_slock_list           nlm_slocks;             /* (z) */
          int                             cn_idle_tmo;            /* (z) */
          int                             grace_period;           /* (z) */
          int                             retrans_tmo;            /* (z) */
+         boolean_t                       nlm_v4_only;            /* (z) */
          zoneid_t                        nlm_zoneid;             /* (c) */
          kmutex_t                        clean_lock;             /* (c) */
          TAILQ_ENTRY(nlm_globals)        nlm_link;               /* (g) */
  };
  TAILQ_HEAD(nlm_globals_list, nlm_globals);