resolved conflicts for merge of 554402f7 to master

Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh
index f21c48b..ed0b127 100755
--- a/core/find-jdk-tools-jar.sh
+++ b/core/find-jdk-tools-jar.sh
@@ -3,7 +3,7 @@
 else
     JAVAC=$(which javac)
     if [ -z "$JAVAC" ] ; then
-	exit 1
+        exit 1
     fi
     while [ -L $JAVAC ] ; do
         LSLINE=$(ls -l $JAVAC)