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

*** 51,60 ****
--- 51,61 ----
          ip6file=`fmri_to_file $SMF_FMRI $IPF6_SUFFIX`
          [ -f "$ipfile" -a -f "$ip6file" ] && return 0
  
          #
          # Nothing to do if:
+         # - service's policy is 'use_global'
          # - ipfilter isn't online
          # - global policy is 'custom'
          #
          [ "`get_policy $SMF_FMRI`" = "use_global" ] && return 0
          service_check_state $IPF_FMRI $SMF_ONLINE || return 0