TUP-2192: review some problems of svn jar dependency.
Merge branch 'maintenance/5.6'