Add keystone_authtoken to our config generator

Change-Id: I4ead65cfe8a5b1305ef4b9693e79d10e3d3a99bb
keystoneclient now supports Py3K

Change-Id: Ia9e5ccc0ead0c808956d76023c32f518c22c2b34
Merge "Add keystone_authtoken to our config generator"
Merge "keystoneclient now supports Py3K"