set version.mk to 3.1.41 and commands to sub ver 4
set default hadoop conf dir to /etc/hadoop/conf (instead of /etc/hadoop-0.20/conf)
Merge branch '3.1.x' of github.com:jeramirez/osg-roll into 3.1.x
changes to hadoop upgrade: include bestman user,in fstab 'hdfs' replaced 'hadoop-fuse-dfs, make sure to turn off hadoop before upgrade