12220 loader multi-console shouldn't override bootenv.rc

*** 21,31 ****
  
  /*
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   * Copyright 2016 Nexenta Systems, Inc.
!  * Copyright 2019, Joyent, Inc.
   */
  
  #ifndef _SYS_BOOTCONF_H
  #define _SYS_BOOTCONF_H
  
--- 21,31 ----
  
  /*
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   * Copyright 2016 Nexenta Systems, Inc.
!  * Copyright 2020 Joyent, Inc.
   */
  
  #ifndef _SYS_BOOTCONF_H
  #define _SYS_BOOTCONF_H
  
*** 241,251 ****
  /*PRINTFLIKE1*/
  extern void bop_panic(const char *, ...)
      __KPRINTFLIKE(1) __NORETURN;
  #pragma rarely_called(bop_panic)
  
! extern void boot_prop_finish(void);
  
  extern int bootprop_getval(const char *, u_longlong_t *);
  extern int bootprop_getstr(const char *, char *, size_t);
  
  /*
--- 241,251 ----
  /*PRINTFLIKE1*/
  extern void bop_panic(const char *, ...)
      __KPRINTFLIKE(1) __NORETURN;
  #pragma rarely_called(bop_panic)
  
! extern void read_bootenvrc(void);
  
  extern int bootprop_getval(const char *, u_longlong_t *);
  extern int bootprop_getstr(const char *, char *, size_t);
  
  /*