Fixing issues found in smoke test
Merge branch 'master' of swai-git.pdx.intel.com:orcm
Fixing unused variables