CBLT-238:  more screwing around with path variables for windows

Change-Id: I13a85524faeb9eb9468a8958a39ec235800277f2
Reviewed-on: http://review.couchbase.org/34871
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>