Minor catkinization fixes for python scripts.

Confirmed building and installing properly on Hydro, with these fixes.