Revert "I updated the trunk branch to be an exact fork of original apache/mahout, and move patched version to mahout-1069 branch"

This reverts commit 0dfe77496eb41695bd2bd48a17ae894521d5b16f.