Switching to use of BundleTracker
Minow workaround to get it compile on JDK 7