Fixed some path issues for the tests
Merge remote-tracking branch 'origin/hwmgr_integration_modulemgr' into hwmgr_integration_modulemgr
Fixed some of the tests to use the newer ModuleMangerManifest