Unsort pbr and hacking in requirements files

Each of these wants to come first. Python does not have a dep solver,
so order is actually important.

Change-Id: I10450de1839c41d729b606a04a944507d2427987
Merge "Unsort pbr and hacking in requirements files"