Resync poritons of base.pp with openstack upstream
Revert "Add gitpython needed by zuul-merger"

Upstream fixed in: https://review.openstack.org/#/c/110807

This reverts commit 6794175f85a8cde2788031f4bb2e864dcdd7d76b.