merge from rel-1.1-maint branch: collation by subclass functional when property groups are enabled. New style to handle h5.collate NIHVIVO-846
merge from rel-1.1-maint branch: collation by subclass functional when property groups are enabled. New style to handle h5.collate NIHVIVO-846

vivo-project/VIVO,vivo-project/VIVO,vivo-project/VIVO,vivo-project/VIVO