Merge "Bug 1029: Remove dead code: samples/clustersession"