Fix potential NPE
ref #6905 Migrate supplemental data view
ref #6190 removing svn property place holder in first line of code - java files