Merge pull request #5072 from tianon/hack-set-e-consistently

Update bundlescripts to use "set -e" consistently