Abort roll build if package build fails.
Minor clean-up.