ref #6190 removing svn property place holder in first line of code - java files
#5247 Fix duplicate entity issue for new entities by using the new merge service method which returns the input transient object
#5247 Use updated entities
creating new instance of key statement with existing text in the case of copy/paste
refactoring of package names for consistency