Fixed the jackson dependency conflict; updated junit version
Merge branch 'org/issue/dependency-conflict' into new/version