Merge from Oslo-Incubator

This brings in the latest Python 3.x related
fixes from Oslo.

Change-Id: If0207d3b29038483098632586613bba9aeb803f7
Fix test_request_no_token_dummy cms dependency.

* tests/test_auth_token_middleware.py: test_request_no_token_dummy has a
dependency on the keystone.common.cms module importing subprocess prior
to running. The cms._ensure_subprocess() function does this. Call this
function in the base test class's setUp method to ensure subprocess is
imported before symbols from that module are needed. Doing this in the
base setUp will ensure that this works for any additional tests with the
same dependency.

This fix is needed because testr runs tests in non deterministic order
which means that each test needs to be able to run on its own (eg in its
own process without any other tests running first) and they need to run
without interfering any other tests (each test must properly clean up
after itself). Prior to this commit test_request_no_token_dummy would
fail when executed on its own.

Closes-Bug: #1209300
Change-Id: I3cf669b94ed77ad0cd729ead0b4162a3f1b8819f
Merge "Merge from Oslo-Incubator"