Merge some boostbook changes from trunk. Fixes #5480.
The default/delete support, plus fix/update tests.