ref #6190 removing svn property place holder in first line of code - java files
#5242, #5223 Improve performance of derivate loading and editing
merge from trunk
move elevation back to first page #4037
merge-update of trunk and disabling GUI-Control separation