AMQ-6795 Apply patch to allow build on JDK 9