Morocco: Conviction of imprisoned journalist upheld