Simplify deployment script and remove packaging stage.

This reduces quite some code duplication. The packaging stage is now obsolete since the deploy stage always packages and deploys.