Merge branch 'stable-2.11' * stable-2.11: Add correct license for asciidoctor Change-Id: Ib2f7625c5fc28e8c6cb45effc5e290ea45750442