fix some parameter problems which are inconsistent with the comment
Merge remote-tracking branch 'origin/code-purify'

Conflicts:

samoa-api/src/main/java/com/yahoo/labs/samoa/evaluation/ClusteringEvalua
tionContentEvent.java