Merge "Remove ceilometerclient CLI tests"