ref #6190 removing svn property place holder in first line of code - java files
#5335 Use new getLanguageByLabel methof in term service
Renamed classes to match the new order in PreferenceMenu