merge from trunk

git-svn-id: https://babelfish.arc.nasa.gov/svn/roversw/other/soraCore@9644 71bd3d61-4118-0410-985d-8aea7a627388