Fixing a couple of spots where dependency executables were left unstubbed
Making the unstub/re-stub situation a bit cleaner/more idiomatic
Merge remote-tracking branch 'origin/master' into break-out-artifact-upload