UPGRADE 3.1

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/dataintegritytests/trunk@5125 7b40dde9-fc51-43d4-b609-63a66f0a0cee
UPGRADE 3.1 - partially

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/dataintegritytests/trunk@5180 7b40dde9-fc51-43d4-b609-63a66f0a0cee