Merge "42051: Subversion folder causes NPE in PreCompilerBuilder"