Updated openstack/openstack
Project: openstack/keystone  58ff2bc5118ea26f4905d764fd6cfa8bb14a4dbc
null
Change deprecated CLI arguments

According to keystoneclient/shell.py, --token and --endpoint (with
their accompanying ENV vars SERVICE_TOKEN and SERVICE_ENDPOINT)
were retained only for Essex compatibility and should have been
removed during Grizzly, replaced with --os-token (OS_SERVICE_TOKEN)
and  --os-endpoint (OS_SERVICE_ENDPOINT).

This patch updates a couple of doc references to the old options,
and the sample_data tool.

Change-Id: I87060764f40b1612e3a440c3406d094536af4c9c