Bring over fixes from pysg-base branch for Python. These should have been checked in here to begin with and merged to PrivateDev.
Bring over fixes from pysg-base branch for Python. These should have
been checked in here to begin with and merged to PrivateDev.

chbfiv/fabric-engine-old,errordeveloper/fe-devel,errordeveloper/fe-devel,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old,errordeveloper/fe-devel,errordeveloper/fe-devel,errordeveloper/fe-devel,errordeveloper/fe-devel,errordeveloper/fe-devel,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old