Merge "Make the system-current.txt available for use by /vendor tests" into main