Compilation fixes, updates for MAHOUT-1529 changes