Merge conditions of if/else if/else that have the same blocks

Change-Id: I06ba58f60c33642ed0cee843fb17098c0b8f0b04
Signed-off-by: Fabrice Tiercelin <fabrice.tiercelin@yahoo.fr>