Fixed an issue where we might cause our test suite to exit if we end up

concatenating a string with "None" in python. Using a python format string
gets us around this by handling it gracefully.

llvm-svn: 145225