[FIXED JENKINS-20442] Integrate annotation-indexer 1.6 with improved robustness.