Merge "drools documentation redo"