Another attempt at fixing PythonCatalyst build issues.

I have a good feeling about this one :).

Change-Id: I37070f86a92169489a8cf1eecd0deadd790be06d
Merge topic 'renable_catalyst_tests' into next

c23479f Another attempt at fixing PythonCatalyst build issues.