Merge "Add better error reporting to ConfigSnapshot parser"