Merge "leverage testapi's own gitignore"