ref #6190 removing svn property place holder in first line of code - java files
fix #5759 remove all switches for remoting and standalone
Add remoting checks for merge, Move to merge call which returns updated transient object
#5225 Replace saveOrUpdate with merge for new entity wizards
rename FieldObservation -> FieldUnit #3566
rename NewFieldObservationWizard.java and label #3566