ref #6190 removing svn property place holder in first line of code - java files
fix #5759 remove all switches for remoting and standalone
add nomenclatural author search for team members
Revert some changes to allow compilation. Needs to be fixed ASAP
Add remoting checks for merge, Move to merge call which returns updated transient object
#5225 Replace saveOrUpdate with merge for new entity wizards
Fixed #2435
had to rename the packages to make them compliant with buckminster