Merge "gitignore: add some entries" into nextgenv2