Merge "Prevent project.config corruption when plugin name is invalid"