[FIX] CLI, #619: Some JLine 2 adaptations
[MIN] Aligned with latest JUnit version