Make 0.4.1 and later clients require Padding=2

As part of #31356 (moved), we need to make 0.4.1 and later clients require Padding=2.