Blanket update of src/main/docbkx from master
Update CHANGES.txt for 0.99.2