Merge branch 'master' into 'latest'

# Conflicts:
#   tsi-cc/ResOps/scripts/kubespray/resops.tf
4 jobs for latest in 2 minutes and 36 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #159154
build-ehk

00:00:52

passed #159155
build-rtfd

00:01:25

 
  Deploy
passed #159156
deploy-rtfd

00:01:11

manual #159157
allowed to fail manual
erase-cms