Merge "(refs #7521) Added FunctionalRelation types to properties in graphfile"