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