BIGTOP-1359. fix a few issues with our puppet_toolchain code