Merge "Update gitignore because of oslo setup.py"