Update the keyring dependency

Keyring is now at version 3.6 so it seems like
we should be ok moving to a newer version and
removing the need to continue supporting the
older versions.

Also the existing requirement doesn't seem to
make logical sense. It doesn't seem that this
restriction '>=1.6.1,<2.0,>=2.1' should ever
match anything.

Change-Id: I711092bfab97190de635a099fb0e771a22e90197
Upgrades Pbr to exclude 0.7 due to Windows issue

Pbr 0.7 fails on Windows generating a blocking issue:
https://bugs.launchpad.net/pbr/+bug/1294246

Change-Id: Ieab4bf32b04ee080d8447e12e92dc47508f87083
Merge "Update the keyring dependency"
Merge "Upgrades Pbr to exclude 0.7 due to Windows issue"