Manoj Govindassamy The changes look good. There is one more place where we have to change. Diskbalancer is invoked via a script called hdfs that is located at hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
it is a bash script and the HADOOP_CLASSNAME variable should change too. We should replace this line
Our current set of tests will not catch this, may be you can address this issue also as part of addressing
HDFS-10599. Right now to verify I suggest that you deploy a pseudo node and make sure that you can run hdfs diskbalancer and you are able to see help.