minor changes in schema and discovery for python2.6

Change-Id: I815f759585b82fa2d9a5157444d530d5620fbb43
Merge "minor changes in schema and discovery for python2.6"