Comment 3 for bug 1002917

Dolph, for the record I posted a patch for review.
  https://review.openstack.org/#/c/13061/

If Username/pass or token is specified, we authenticate and print the dict {id, expires}. Otherwise, we retain default behavior.