make sure smoke-test prereqs are built too
umm... oops?
Merge branch '1.10' into 1.12

Conflicts:
	smoke-test/do-smoke-test.sh