Merge pull request #2790 from swiftlang/jgrynspan/exit-test-round-2

[ST-0008] Update proposal for second review round.

Author: maartene