fix some regression in StructureMatcher.get_s2_like_s1
Automatic Py3k merge for testing