Fix warnings in clustering

Fixes the use of raw types.

Change-Id: I06d7935e6686bfceb3c574c9465a76adff2c825c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Fix warnings in clustering"