Rwanda's Kagame names new FM, intelligence boss, ahead of polls