Resync the SVN version of this tinderbox script with the one
used on the tinderbox test host.


git-svn-id: svn://irodssvn.ucsd.edu/trunk@5433 ea137bd6-aa86-47b6-b90d-b101d9f19a90