Merged Propel2 memory leak fix

Merged https://github.com/propelorm/Propel2/pull/482 Propel2 memory leak, fix file messup