add icehouse compatibility
remove PKI token test
 Merge branch 'master' into 'master'

Master
Apply pep8
Add test for header caryover.
Merge branch 'master' of git.office.xl-is.net:openstack/openstack-api-conformance
Add cors tests.
Test swift copy