You used to have these in the token, why were they removed and then
subsequently grabbed at? The change that added these doesn't work against
keystone, btw, so I'm surprised it got in, these dict keys are not
required to be in the return from service_catalog.get_token() and
adding them as properties is only going to make matters worse as people
rarely think about having None attributes.
Change-Id: I695bbd6730d25d8db3a25cea81e3ffb0ef289bbb