Updated openstack/openstack
Project: openstack/ceilometer  d7c0e683420a357aff3c6743335a1113197bfc47
null
Replace mox with mock in tests.collector

Change-Id: I4d8f8ec812a136f9e117535c98c4cbaa29791817
Updated openstack/openstack
Project: openstack/ceilometer  9324c4ce3f10d6fff272bce6cc03a7858af0d42a
null
Imported Translations from Transifex

Change-Id: Ieeb3084892f6cfe3bdbf3b24068cb93b5d14ea80