ref #6190 removing svn property place holder in first line of code - java files
smaller fixes
merged model adaptions to cdmlib 3.2.4 from campanula branch
Fixes #2733