ref #6190 removing svn property place holder in first line of code - java files
merge-update of trunk and disabling GUI-Control separation