MAHOUT-1500 H20

Creating a PR to just to be able to (re-)view what current state of diff is against master in this work.
I think if all these tests are passing, this would be an incredibly cool step forward in this issue..