Change elifs to ifs
Change elifs to ifs

John seemed to have some misgivings about using elif.

Change-Id: I39962607cf2a8f90353020f67979e92b48959dd6
Related-Change: I7732f13b06c8826537b8f8230a2785607790b8e1

redbo/swift,nadeemsyed/swift,tipabu/swift,notmyname/swift,swiftstack/swift,openstack/swift,clayg/swift,notmyname/swift,larsbutler/swift,swiftstack/swift,openstack/swift,smerritt/swift,clayg/swift,hurricanerix/swift,hurricanerix/swift,tipabu/swift,prashanthpai/swift,psachin/swift,tipabu/swift,clayg/swift,clayg/swift,openstack/swift,nadeemsyed/swift,nadeemsyed/swift,matthewoliver/swift,psachin/swift,matthewoliver/swift,matthewoliver/swift,nadeemsyed/swift,prashanthpai/swift,redbo/swift,smerritt/swift,smerritt/swift,psachin/swift,psachin/swift,smerritt/swift,swiftstack/swift,hurricanerix/swift,notmyname/swift,matthewoliver/swift,openstack/swift,hurricanerix/swift,notmyname/swift,tipabu/swift,larsbutler/swift