Merge "Adds initial ceilometerclient testing code"