Fix test_provider_token_expiration_validation transient failure

The keystone.tests.test_token_provider.TestTokenProvider.
test_provider_token_expiration_validation test would fail if the
tests weren't run before the sample token expired. This could
happen if the system was slow and the previous tests took a long
time causing a potential transient failure.

Change-Id: Ia662fcdc0cd26568fa8ea9f27d0a34cb1bfe46e6
Closes-Bug: #1278550
Correct a docstring in keystone.common.config

Correct the docstring for keystone.common.config.list_opts to have
better grammar and make sense.

Change-Id: I4861e1ab111d89363267607aa411a5326279f0af
Merge "Correct a docstring in keystone.common.config"
Merge "Fix test_provider_token_expiration_validation transient failure"