tree 2b29558e8c3a7fc2b1564cf508785b3cf6cdf589
parent 8d5ac8aa7c36b9ad21f64940436926327f873708
author beierlm <mark.beierl@canonical.com> 1612800653 -0500
committer beierlm <mark.beierl@canonical.com> 1612800683 -0500

Cherry picks from master

https://osm.etsi.org/gerrit/c/osm/devops/+/10223
https://osm.etsi.org/gerrit/c/osm/devops/+/10195
https://osm.etsi.org/gerrit/c/osm/devops/+/10142

Change-Id: I80cb5afe884c03a6e97553b4b805fc98c4a5e41b
Signed-off-by: beierlm <mark.beierl@canonical.com>