Port fixes to include processor from Asciidoctor

In the Asciidoctor 2.0.x release line, there were two fixes to the processing of the include tags pattern. See asciidoctor#3932 and asciidoctor#4048. Port these fixes (as well as any tests) to the include processor in Antora.