update from master

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

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

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