Support py 2.6, remove comma-separated context lists

Change-Id: I1ca4d9d45fa1220bd52d31091a093386d5a73b8b