Fix branch checkout order

Since we're deprecating override-branch in favor of override-checkout,
favor override-checkout when deciding which to use.

Also, change an if to elif to make sure we only do one of these.

Change-Id: I55a94188d9894df27d99416cd3cefff8f3a64718
1 file changed