Remove usage of d2to1

d2to1 pulls in setuptools, which trips the unhappy bugs with setuptools
updating. Move past that and just use new pbr.

Change-Id: I2609eda10ed781116940c3607ff85a14fc4b7f58
Merge "Remove usage of d2to1"