Support py 2.6, remove comma-separated context lists

Change-Id: Ie378bdfa00cd9b608d7ae99ebe458fa3d26887fd