Merge "Bug 1826: moving clustering test application from integration branch to contro...