fix help message of deprecated command

Adds command name instead of deprecated command to help message.

Change-Id: Ib6cbbcd24bbf015cf3656be9cbdf7de25d4d9cf7
Add complex query support for samples

Change-Id: I88c4eb6fa32514100187dbbca9777c7a5974fac6
Deprecate 'alarm-update'

Like deprecating alarm-create, we can use alarm-threshold-update and
alarm-combination-update instead of alarm-update.
So, mark alarm-update as 'Deprecated'.

Change-Id: I8c9718d76e40729dc6094611a055c904e27619ba
Checking the type of auth_token, and fixing it if necessary

When creating a new Client object by calling the get_client function,
if the ceilometer_url is not passed as a parameter, but the token is
passed, the auth_token is converted to a lambda function.
However, when both the ceilometer_url and the auth_token are passed,
this conversion does not take place.
This fix checks if the auth_token is a lambda function or not.
If it is not, it creates a new lambda function which returns the
token.
Without this check, if a token was passed as a string, the
python client would throw and error, when trying to call
self.auth_token() in ceilomenterclient/common/http.py.

Change-Id: I3e564fcf17ce497546b75f0ab8c7ca0f6f2099df
Closes-Bug: #1254186
Fix temporary pypy gate issue with setuptools

Adding a fix proposed in https://bugs.launchpad.net/openstack-ci/+bug/1290562
to avoid continuous gate failures because of setuptools issue reported in the
bug linked above.

Temporary Fixes-bug: #1290562

Change-Id: Id7ff477c4168f42bee2c3c9a8fc70ff7953bf10a
Merge "Add complex query support for samples"
Merge "Checking the type of auth_token, and fixing it if necessary"
Merge "fix help message of deprecated command"
Merge "Deprecate 'alarm-update'"
Updated from global requirements

Change-Id: I2232c0c00179dd604dbe789b72ce721ded7c5622