MessageBundleBuilder: finish migration to MessageBundle for messages
PropertiesBundle: convert to a bundle, and add a FIXME

There is another private static final variable in this class, and if I declare
it AFTER the bundle, it is null! Doh.