switch over to new discovery using cassandra

Change-Id: I1199399306063bcbcaa77f6208b6a32f06bb99b6
Merge "switch over to new discovery using cassandra"