Merge "Run gnocchi upgrade with sacks in docker template"