ref #6190 removing svn property place holder in first line of code
merge validation2 and model 3.5 into trunk