ref #6190 removing svn property place holder in first line of code - java files
convert methods has updateResult as return type
#5268 Use convert methods which use uuids
bulkeditor: merge of teams and persons and convert team to person and person to team