Merge "Make get-bundle-url script more reusable"