Replacing instances of Collection with List including some type casting in Cluster.java.
Merge branch 'scenario1' into scenario1-s1