11224 nightly and bldenv should be usable directly

@@ -24,11 +24,11 @@
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2008, 2010, Richard Lowe
 # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2012 Joshua M. Clulow <josh@sysmgr.org>
 # Copyright (c) 2017 by Delphix. All rights reserved.
-# Copyright 2019 Joyent, Inc.
+# Copyright 2020 Joyent, Inc.
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
 # Copyright 2019 Peter Trible.
 #
 # Based on the nightly script from the integration folks,
 # Mostly modified and owned by mike_s.

@@ -664,14 +664,10 @@
                 echo "Cannot find env file as either $1 or $OPTHOME/onbld/env/$1"
                 exit 1
         fi
 fi
 
-# contents of stdenv.sh inserted after next line:
-# STDENV_START
-# STDENV_END
-
 # Check if we have sufficient data to continue...
 [[ -v CODEMGR_WS ]] || fatal_error "Error: Variable CODEMGR_WS not set."
 if  [[ "${NIGHTLY_OPTIONS}" == ~(F)n ]] ; then
         # Check if the gate data are valid if we don't do a "bringover" below
         [[ -d "${CODEMGR_WS}" ]] || \