Master Major Version Release Fails

Our release script from master is failing due to a missing rpm - to fix make the test rpm upload optional for now.

While doing it, it is a chance for a small cleanup of our release scripts.