Merge "Fix typo in fixing gnocchi upgrade."