Merge "Manage multiple slaves for functest"