Holly's final test case updates for RC 2...
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop