Don't use spring if it's not in the lockfile

This only applies to binstubs - it's still possible to use spring via
"spring ..." when not using binstubs.
more test helper fixes