Merge "Last round of modern authtoken update"
authorJenkins <jenkins@review.openstack.org>
Thu, 1 Sep 2016 01:42:15 +0000 (01:42 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 1 Sep 2016 01:42:15 +0000 (01:42 +0000)

Trivial merge