Merge some non-spirit 2 changes from the spirit 2 branch.

Mostly administrative, but also disable xinclude test as it fails on some
platforms due to the different paths used by boost build, I'm not sure how to
fix it.


[SVN r58034]

tools/quickbook

@@ -1 +1 @@
-Subproject commit 5ef47624ae4db27d9a64d31cace73750beaae924
+Subproject commit df40ab1e3716681d89925c3e517550ac027d3260