MAHOUT-1346

Squashed commit of the following:

(...too long to list... )

git-svn-id: https://svn.apache.org/repos/asf/mahout/trunk@1575169 13f79535-47bb-0310-9956-ffa450edef68