CCv0: Merge main into CCv0 branch

Merge remote-tracking branch 'upstream/main' into CCv0

Fixes: #3573
Signed-off-by: stevenhorsman <steven@uk.ibm.com>

tools/osbuilder/scripts/lib.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2018-2020 Intel Corporation
 #
@@ -74,7 +74,6 @@ retries=5
 EOF
 	if [ "$BASE_URL" != "" ]; then
 		cat >> "${DNF_CONF}" << EOF
-
 [base]
 name=${OS_NAME}-${OS_VERSION} ${REPO_NAME}
 failovermethod=priority
@@ -83,7 +82,6 @@ enabled=1
 EOF
 	elif [ "$MIRROR_LIST" != "" ]; then
 		cat >> "${DNF_CONF}" << EOF
-
 [base]
 name=${OS_NAME}-${OS_VERSION} ${REPO_NAME}
 mirrorlist=${MIRROR_LIST}