streamline build scripts
diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index f80ef0f..b02013a 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -1,19 +1,19 @@
 #!/bin/sh
 
-# remember to leave no slashes on filename in source command, 
+# remember to leave no slashes on filename in source command,
 # (the commonVariations.shsource file, that is)
 # so that users path is used to find it (first)
-if [ -n $BUILD_INITIALIZED ] 
+if [ -n $BUILD_INITIALIZED ]
 then
-   source commonVariations.shsource 
-   source ${RELENG_CONTROL}/commonComputedVariables.shsource  
+   source commonVariations.shsource
+   source ${RELENG_CONTROL}/commonComputedVariables.shsource
 fi
 
 jmxport="7000"
 webport="7777"
 rmiport="1099"
-# its ok for these to be trivial, just used to prevent 
-# accidental use, no real security needed. 
+# its ok for these to be trivial, just used to prevent
+# accidental use, no real security needed.
 trivialUserName="wtp"
 trivialPw="ballad"
 
diff --git a/releng.control/commonComputedVariables.shsource b/releng.control/commonComputedVariables.shsource
index f697515..e05400b 100644
--- a/releng.control/commonComputedVariables.shsource
+++ b/releng.control/commonComputedVariables.shsource
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# intentionally named "shsource" to denote this is intended to 
-# be included in other sh files, with "source" command, not 
-# executed on its own. 
+# intentionally named "shsource" to denote this is intended to
+# be included in other sh files, with "source" command, not
+# executed on its own.
 
 ########################################################
 
@@ -11,11 +11,11 @@
 export ANT_WORKING=${BUILD_HOME}/antWorking
 export BASE_BUILDERS=${BUILD_HOME}/basebuilders
 export PROJECT_BUILDERS=${BUILD_HOME}/projectBuilders
-# 	Set this to the relative path for the 
-# 	directory that keeps the downloaded drivers 
+# 	Set this to the relative path for the
+# 	directory that keeps the downloaded drivers
 #   and pre-reqs
 export LOCAL_PREREQS_CACHE=${BUILD_HOME}/prereqsCache
-# must match cacheRoot in CC's web.xml 
+# must match cacheRoot in CC's web.xml
 export CACHE_ROOT=${BUILD_HOME}/logcache
 # must correspond to what's specified in CC's web.xml file, and config
 export LOG_DIR=${BUILD_HOME}/logs
@@ -46,49 +46,49 @@
 # project name is resolved dynamically, as CC runs
 export LOG_DIR=${BUILD_HOME}/logs
 
-# need for some PPC or Linux issues 
+# need for some PPC or Linux issues
 export JAVA_HIGH_ZIPFDS=500
 
-# for now, always use Java 5 as native "home", but 
+# for now, always use Java 5 as native "home", but
 # scripts and paths may still use java 1.4
 export JAVA_HOME=${JAVA_5_HOME}
 
-# for  builds on local machines, SKIPUSERS should be 'true' to avoid 
+# for  builds on local machines, SKIPUSERS should be 'true' to avoid
 # notifying users about those builds on your local machine
 # but if not defined thus far, set to false for production build machine.
-if [ -z ${SKIPUSERS} ] 
-then 
+if [ -z ${SKIPUSERS} ]
+then
 	export SKIPUSERS=false;
 fi
 
-# We want everything in our processes to use UTC, even when we can't 
+# We want everything in our processes to use UTC, even when we can't
 # change the time or timezone on the build machine.
 export TZ='UTC-0';
 
 
 export BUILD_INITIALIZED="true"
 
-echo 
+echo
 echo "    Project Home: ${PROJECT_HOME}"
 echo "    Build Home: ${BUILD_HOME}"
 echo "    DISPLAY: ${DISPLAY}"
-echo 
+echo
 echo "    JAVA_4_HOME: ${JAVA_4_HOME}"
 echo "        ${bootclasspath}"
-echo 
+echo
 echo "    JAVA_5_HOME: ${JAVA_5_HOME}"
 echo "        ${bootclasspath_15}"
-echo 
+echo
 echo "    ANT_HOME: ${ANT_HOME}"
-echo 
+echo
 echo "    PATH: ${PATH}"
-echo 
+echo
 echo "    BASEOS: ${BASEOS}"
 echo "    BASEWS: ${BASEWS}"
 echo "    BASEARCH: ${BASEARCH}"
-echo 
-echo "    LOCAL_BUILD_PROPERTIES_DIR: ${LOCAL_BUILD_PROPERTIES_DIR}" 
-echo 
+echo
+echo "    LOCAL_BUILD_PROPERTIES_DIR: ${LOCAL_BUILD_PROPERTIES_DIR}"
+echo
 echo "    remember to check that X virtual frame buffer is running for headless JUnit testing";
 ps -ef | grep Xvfb
 echo
diff --git a/releng.control/commonVariations.shsource b/releng.control/commonVariations.shsource
index 6923971..8d6ee5e 100644
--- a/releng.control/commonVariations.shsource
+++ b/releng.control/commonVariations.shsource
@@ -4,24 +4,24 @@
 # though there is a similar one (with same name) in main
 # directory that is.
 
-# If "local" users have this file on their path, 
-# that is, in "someDirectory" on the users local path, 
+# If "local" users have this file on their path,
+# that is, in "someDirectory" on the users local path,
 # then the bash "include source" function will find that version
 # first, instead of the "standard" eclipse production one.
 
-# this file is intentionally named "shsource" to denote this is intended to 
-# be included in other sh files, with "source" command, not 
-# executed on its own. 
+# this file is intentionally named "shsource" to denote this is intended to
+# be included in other sh files, with "source" command, not
+# executed on its own.
 
-# Some things _have_ to go in this file, instead of being an ant property, 
-# since they may be used outside the contect of ant (or, before ant get's started). 
-# as one example, anything used directly in the cc_config.xml file has to be 
-# provided as environment variable, since it can not import ant property files 
+# Some things _have_ to go in this file, instead of being an ant property,
+# since they may be used outside the contect of ant (or, before ant get's started).
+# as one example, anything used directly in the cc_config.xml file has to be
+# provided as environment variable, since it can not import ant property files
 # like most ant project files can.
 
 export BUILD_HOME=/shared/webtools
 
-# the following does not really vary, but must be specified "early" 
+# the following does not really vary, but must be specified "early"
 export RELENG_CONTROL=${BUILD_HOME}/releng.control
 
 export DISPLAY=127.0.0.1:1.0
@@ -39,14 +39,14 @@
 export BASEARCH=ppc
 
 # no local build properties, for production builds
-# for local builds, this should be set to a real directory, 
+# for local builds, this should be set to a real directory,
 # so meaningful properties can be set for that local machine.
 # See the 'localBuildExample' directory for a starting example
 export LOCAL_BUILD_PROPERTIES_DIR=
 
-# note: buildmaster email address should be "real" address 
-# that is subscribed to the mailing list, if you want to send 
-# mail to mailing list. 
+# note: buildmaster email address should be "real" address
+# that is subscribed to the mailing list, if you want to send
+# mail to mailing list.
 export BUILD_BUILDMASTER_EMAIL=david_williams@us.ibm.com
 
 export BUILD_BUILDMASTER_RETURN_NAME=wtpBuild
@@ -59,42 +59,42 @@
 export USE_LOGGER=false
 
 #contols ANT's quietness level
-# true logs error and warnings only 
+# true logs error and warnings only
 export USE_QUIET=false
 
 # controls ANT's debug level
 # setting to true will result in TONS of ouput
 export USE_DEBUG=false
 
-# should be true for production, false for local. 
-# it can be set to true for local builds, but then the 
+# should be true for production, false for local.
+# it can be set to true for local builds, but then the
 # properties in upload.properties need to be set to valid values.
 export BUILD_UPLOAD=true
 
-# if true, locally existing maps will be used as is, instead of being 
-# checked out afresh. Set to false for production builds, so maps are 
+# if true, locally existing maps will be used as is, instead of being
+# checked out afresh. Set to false for production builds, so maps are
 # always fresh.
 export USE_LOCAL_MAPS=false
 
-# normally, cvs logging output can be "really quiet", but if problems, then it can be turned back on 
+# normally, cvs logging output can be "really quiet", but if problems, then it can be turned back on
 # to get more potentially diagnostic information
 # TODO: if both of these are 'true' and error is generated by cvs ...
-# saying you can't set both to true.  
-# we could put in some logic to prevent that, someday. 
+# saying you can't set both to true.
+# we could put in some logic to prevent that, someday.
 export CVS_QUIET=true
 export CVS_REALLY_QUIET=true
-#   these cvs values need to have write access if 
-#   tag.maps is true, as on production machine. 
-#   This is the ID used to both read, and 
+#   these cvs values need to have write access if
+#   tag.maps is true, as on production machine.
+#   This is the ID used to both read, and
 #   to tag releng map files.
 #
-#   Note: 
-#   'ext' protocol typically requires 
+#   Note:
+#   'ext' protocol typically requires
 #   environment variable CVS_RSH to be set to ssh
 #   So, we just always do it. Can't imagine it'd hurt
-#   if protocol was pserver, but could be removed in that 
-#   case, if desired. 
-export CVS_RSH=ssh 
+#   if protocol was pserver, but could be removed in that
+#   case, if desired.
+export CVS_RSH=ssh
 export BUILD_CVS_READ_PROTOCOL=pserver
 export BUILD_CVS_READ_USER=anonymous
 export BUILD_CVS_WRITE_PROTOCOL=ext
@@ -103,6 +103,6 @@
 
 export BUILD_CVS_ROOT=/cvsroot/webtools
 
-# for  builds on local machines, SKIPUSERS should be 'true' to avoid 
+# for  builds on local machines, SKIPUSERS should be 'true' to avoid
 # notifying users about those builds on your local machine
 export SKIPUSERS=false