ref #4232: some more comparators to adapt
ref #6190 removing svn property place holder in first line of code - java files
had to rename the packages to make them compliant with buckminster