ref #6190 removing svn property place holder in first line of code - java files
refactoring of package names for consistency
Committing changes to definedtermeditor after merge from branch
had to rename the packages to make them compliant with buckminster