Miscellaneous updates related to MessageSource and ResourceBundle handling
Add datasource plugin