Upgrade to TestNG 6.8.5

Issue: SPR-10638