[SDNC-5] Rebase sdnc-oam

Port to OpenDaylight Boron and sync updates since 16.10

Change-Id: I9f6febe0bd3d50c3d27c775e5a41806ee3d2e6cb
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: c7fb7db31a50d5f0005251d41f497fbd4fb2ae4b
diff --git a/dgbuilder/tools/format_xml.sh b/dgbuilder/tools/format_xml.sh
index f0074e6..c66153e 100755
--- a/dgbuilder/tools/format_xml.sh
+++ b/dgbuilder/tools/format_xml.sh
@@ -8,10 +8,9 @@
 then
         export PROJECT_HOME=$(pwd)/..
 fi
-export CLASSPATH=$CLASSPATH:.
 if [ -e "$1" ]
 then
-	java FormatXml $1
+	python $PROJECT_HOME/tools/formatXml.py $1
 else
 	echo "File $1 does not exist" 
 fi