Validate S3 tokens against Keystone

tidy up a bit

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>