Merge units from the trunk.
rm cmake from the release branch before it goes out broken.  Policy dictates that you never commit to release, you commit to trunk and merge to release.
Merge documentation fixes.

* Use `doc/src/*.css` instead of `doc/html/*.css`.
* Remove wiki and people directories.
* Some documentation fixes.
* Left out `minimal.css` changes and boostbook changes because of clashes.
Merge units from trunk
Merge fixes for test_output from the trunk.
Merge units from the trunk.
Merge units from the trunk.