More store upgrade integration test
Merge pull request #2905 from davidegrohmann/2.1-store-upgrade-test

More store upgrade integration test