Support py 2.6, remove comma-separated context lists

Change-Id: Id075b524e230d77307d23d90fcb0314e8ad21161