Merge branch 'prod_hotfix_1' into dev

This is necessary because the hotfix was checked into the production
branch and should be available across all branches on a go forward
basis.
Change CMakeLists.txt files to list specific cpp files to compile
Merge branch 'qa'