fixed ReloadableResourceBundleMessageSource and refactoring