Fix determining the zip root folder.
Always upgrade branch based packages for now.

Later on, the actual HEAD revision should be compared to what is already installed, so that upgrading is only done if necessary.