Fix log message.

Fix a missing key in the log format.

Change-Id: I275f5e5fbfb6465b39d9ed7b4a9ace045ded4b5d
Fix and enable flake8 F812

F812 list comprehension redefines

List comprehension don't have scope so redefining variables can lead to
unexpected behaviors

Change-Id: I85484dfcd4fa391195ea7be75aadc7897da4739c
Merge "Fix log message."
Merge "Fix and enable flake8 F812"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp