CC-4905: Unit tests for Pypo

-whitespace removal
remove using self in a static method
Merge branch '2.3.x' into 2.3.x-saas