Remove SERVICE_TOKEN and SERVICE_ENDPOINT env vars

From the code itself:

 deprecated command line options for essex compatibility. To be
  removed in Grizzly release cycle.

so this patch removes these deprecated env vars that have been
moved into the OS_* namespace since Folsom, and updates the tests
that probably should have been using the non-deprecated option
anyway :)

The fact these are still in there are causing some confusion,
we actually had a bug report over in docs claiming OS_SERVICE_TOKEN
should be replaced with SERVICE_TOKEN!

Change-Id: I205748be225dbacc3a528724cf3722d8bf7f8d9f
Improved error message on connection failure

Added message from thrown error to message generated when httpclient connection fails

Closes-Bug: 1248257

Change-Id: Id47092f5775b97e8423e18c294f4e04872aa0b08
Add --insecure to curl output if required

When the --insecure option is given, the curl command did not have
certificate verification turned off.

Partial-Bug: #1249891
Change-Id: Ia4f21d03f060bac0db51a79b89b0246b2ee3d041
Fix curl debug output for requests with a body

Rather than output the request body as a separate line, make it part of
the example curl command using the -d option.

Partial-Bug: #1249891
Change-Id: Ie3fe4535f554333c67244a13c5698c025f000e7e
Quote URL in curl output to handle query params

Copy and pasting the generated curl output into a shell doesn't
work when the URL includes an ampersand, as the URL isn't quoted.

Closes-Bug: #1249891
Change-Id: Ic3d7682a2c034e89c3367c858ea33510f8cbc7d4
Update tox.ini to usedevelop

The 0.8 hacking tests were failing because it fails to open the
sample files during import. Setting usedevelop=True in the tox.ini
makes the tests run in the right directory.

Change-Id: I7b8f531f669e38e1b009a50d2ed9e9c98cf82e53
Fix python3 incompatible use of urlparse

Use six to make it work. While we're not yet able to gate
keystoneclient on py33, we still need keystoneclient to work when
keystoneclient is included in other libraries' test suites. This was
discovered while working on python3 for python-tuskarclient.

Note that together with I65c28896d1551fd537dd7774e87bc479a477a7ab
keystoneclient can be used safely in python-tuskarclient's py33 tests.

Closes-bug: #1239802

Change-Id: Ie6d31dc5fae7e63bb31a5192fa6765fe35dd026a
Add testresources test requirement

testresources wasn't a test requirement, so it couldn't be used
in test code.

Change-Id: I278e56f5158800e7873ad03a9d6a3db2ea8bad7c
Remove service type restriction from keystone client help text

The current output of "keystone help service-create" implies that the
type is restricted to certain values.  This commit updates the help
text to make it more clear that the value isn't validated.

Closes bug 1248658
Closes bug 1211292

Change-Id: Ice4bf0da135d371ab5b6339f7baac7309e9c40ce
Opt-out of service catalog

Introducing a config option 'include_service_catalog' to indicate whether
service catalog is needed. If the 'include_service_catalog' option is set to
False, middleware will not ask for service catalog on token validation and will
not set the X-Service-Catalog header.

This option is backward compatible as it is default to True.

DocImpact
Fixed bug 1228317

Change-Id: Id8c410a7ae0443ac425d20cb9c6a24ee5bb2cb8d
Merge "Fix python3 incompatible use of urlparse"
Merge "Update tox.ini to usedevelop"
Merge "Add --insecure to curl output if required"
Merge "Improved error message on connection failure"
Merge "Remove SERVICE_TOKEN and SERVICE_ENDPOINT env vars"
Merge "Add testresources test requirement"
Merge "Remove service type restriction from keystone client help text"
Merge "Fix curl debug output for requests with a body"
Merge "Quote URL in curl output to handle query params"
Merge "Opt-out of service catalog"