CSPACE-5981: merging in additional code, changes to support Python 2.6, etc.