Csm perf harness

Merge changes to adapt to work with rtcloud into the perf harness branch.