fixed manifest parser for python 2.5
updated some tools for e2e