[MERGE] Changed the base test directory setup to use osutils.join instead of os.path.join

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Adrian Wilkins wrote:
> 

BB:approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkibIYsACgkQJdeBCYSNAAP2wQCbB9xcXrda0plSr5zuuSRZLMEH
D7oAnAoN/ZQlhHBmzw9cglB7e6ho3Hg5
=W4kI
-----END PGP SIGNATURE-----