Merge pull request #555 from aidangarske/fenrir-fixes-7011-7020 #187

Job	Run time
Empty Brace Scope Scan	6s
smoke (swtpm-default, --enable-swtpm --disable-fwtpm, true)	1m 39s
smoke (fwtpm-default, --enable-fwtpm --enable-swtpm --enable-debug, false)	1m 30s
	3m 15s

Provide feedback