Put the "else" (or "elseif") on the same line as the previous closing brace

Per https://www.mediawiki.org/wiki/Manual:Coding_conventions#Indenting_and_alignment

Change-Id: I208981db0a866524156bad18cb687f010afeac2c
Merge "Put the "else" (or "elseif") on the same line as the previous closing brace"