Adding some entries to .gitignore of auto-generated files detected as changes following clean checkout and build.
Including additional null checks the Java 7 compiler complains are missing
merging experiment data depot changes