updates to list view queries and constructs; includes fix for VIVO-399
Merge branch 'maint-rel-1.6' into develop
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop