Various testing and warning fixes
Merge branch 'devel' of elmo.lanl.gov:gitlab/scout into devel
fix for FindOpenGLVersion.cmake