merge r5446:5449 r5486 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 
merge r5446:5449 r5486 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 

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