Merging in NIHVIVO-3587 from 1.4 maintenence branch (data not showing when collated view is selected)
Merging in NIHVIVO-3587 from 1.4 maintenence branch (data not showing when collated view is selected)

vivo-project/Vitro,vivo-project/Vitro,vivo-project/Vitro,vivo-project/Vitro