merge storage branch and fix merge conflicts
change namespace in storage scneario test
Merge branch 'test' into alpha