make sure smoke-test prereqs are built too
Merge remote-tracking branch 'origin/1.12' into pjsm/2.0