Revert upgrade of asciidoctor, JDK6 problems