turned collation on for advisees faux property VIVO-640
Merge branch 'maint-rel-1.6' into develop