Fixup problems with space in pwd

Change-Id: I3884a2fa97126d065fb24a3fc63fdfa9c5db471c
Reviewed-on: http://review.couchbase.org/35501
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>