Cfy 1274 adjust plugins common to work with py26