Update pbr and requirements to be current

The usage of pbr and the rest of the requirements need to be update to
be up to date with modern usage.

Change-Id: I7dd4c6d6f6721205a293d427851733a0391ea72e
Merge "Update pbr and requirements to be current"