Merge upstream onaio/onadata commits into our branch
Upstream renamed common.pip to base.pip; move our modifications there