Indonesian president puts ex-general, popular World Bank leader in cabinet