Fixes shutdown issues in camera-test
Merge branch 'master' of github.com:psde/Knowledge