Properly pin pbr and d2to1 in setup.py

We did nova first in the pbr transition, so it didn't get the pin
we added to everyone else later on.

Fixes bug 1199923

Change-Id: I04c3e810f49a1e4388496ff5226cf094c787d1a9
Merge "Properly pin pbr and d2to1 in setup.py"