ref #6190 removing svn property place holder in first line of code - java files
#5242, #5223 Improve performance of derivate loading and editing
refactoring of package names for consistency