Merge branch 'master-v2' into UIMA-6263-CAS-validation-support

* master-v2:
  [UIMA-6264] Switch from DocBook to Asciidoc