Fixed set syntax to be compatible with python2.6

Change-Id: I69c888839c8d6396c4b48cb8f1a78636569138e2
Python2.6 syntax fixup

Python2.6 does not have dictionary comprehension, but we can do
something similar using the dict(...) constructor.

Change-Id: I2e91a98d6e83a6b1471ac124a7aaae2564421210
Python2.6 syntax fixup

Python2.6 does not have dictionary comprehension, but we can do
something similar using the dict(...) constructor.

Change-Id: I29d5ef410a911b63cda09dc2bc4646359e1769a9
Fixing python2.6 syntax errors

In python 2.6 the string .format(...) method cannot handle empty
brances within the string. i.e. 'instance name: {}'.format(name)
does not work.

The TestCase method assertIs does not exist in python 2.6.

Change-Id: I5628fba5f3319efe212ce6b92c5d04b5b4dacdf1
Merge branch 'stable/folsom' into master

Change-Id: I2074386e0ad50248c0052c11cb803ff4725a6ae9