Fix line rewrite with console output listener
Fix directory sort for diff computation

Directories must be sorted in order to be compared while computing
differences. So directory computation now returns (already) sorted
directories.
Update pom.xml to new release
Merge branch 'master' into backport-1.6
Fix Javadoc