Fix JAVA_HOME, fix /etc/pam.d access

Change-Id: I4a44ad6d61d0096e64b64fcd09131ef91919628d
diff --git a/opt-setup.sh b/opt-setup.sh
index ee3b0cc..7c64126 100644
--- a/opt-setup.sh
+++ b/opt-setup.sh
@@ -139,8 +139,7 @@
 export ONOS_ROOT=~/onos
 export KARAF_ROOT=~/Applications/apache-karaf-3.0.2
 source onos/tools/dev/bash_profile
-echo $JAVA_HOME
-export JAVA_HOME=""
+unset $JAVA_HOME
 cd onos && mvn clean install && mvn dependency:go-offline && cd -
 
 cp onos/tools/package/branding/target/onos-branding-1.0.1-SNAPSHOT.jar Applications/apache-karaf-3.0.2/lib/
@@ -155,8 +154,8 @@
 EOF
 
 # Setup profile
-echo "unset JAVA_HOME" >> ~/.profile
 echo "source $ONOS_ROOT/tools/dev/bash_profile" >> ~/.profile
+echo "unset JAVA_HOME" >> ~/.profile
 echo "sudo service onos stop > /dev/null 2>&1" >> ~/.profile
 echo "cell optical > /dev/null 2>&1" >> ~/.profile