Merge branch '806' into 904
Merge branch 'dev' into 904
Fixes to the service bus scenario tests
Merge pull request #907 from ogail/904

Fixes to scenaio tests integration