Another try at fixing the paths (I misunderstood in my last change),
don't assume /bin/sh has += operators on strings, clean up whitespace.
Don't re-direct through the connection variable if it's NULL.
Merge branch 'develop' of github.com:wiredtiger/wiredtiger into develop

Conflicts:
	dist/s_docs