Adding MR2 options to MAHOUT_OPTS in bin/mahout and bin/mahout.cmd