Sync tempest code from ceilometer

* https://review.openstack.org/530891 and https://review.openstack.org/527960
  are synced into telemetry-tempest-plugin

Change-Id: I6e099890aa03c9bd9b0039ce1e55a182886193e7
2 files changed