fix issues for new EGit Version (3.0.0)