Merge branch 'rel_1_6' of git.evergreen-ils.org:Evergreen-DocBook