Shorted if statements Fixed keybinding for use of modifiers
Shorted if statements
Fixed keybinding for use of modifiers

Change-Id: Ice1a5b27249884e90f78932661b88f71b82769d2

y-higuchi/onos,donNewtonAlpha/onos,opennetworkinglab/onos,LorenzReinhart/ONOSnew,sdnwiselab/onos,opennetworkinglab/onos,y-higuchi/onos,oplinkoms/onos,gkatsikas/onos,donNewtonAlpha/onos,sdnwiselab/onos,opennetworkinglab/onos,osinstom/onos,sdnwiselab/onos,LorenzReinhart/ONOSnew,oplinkoms/onos,kuujo/onos,osinstom/onos,oplinkoms/onos,oplinkoms/onos,osinstom/onos,kuujo/onos,kuujo/onos,gkatsikas/onos,kuujo/onos,osinstom/onos,osinstom/onos,opennetworkinglab/onos,kuujo/onos,gkatsikas/onos,gkatsikas/onos,opennetworkinglab/onos,donNewtonAlpha/onos,LorenzReinhart/ONOSnew,donNewtonAlpha/onos,donNewtonAlpha/onos,LorenzReinhart/ONOSnew,opennetworkinglab/onos,sdnwiselab/onos,gkatsikas/onos,oplinkoms/onos,sdnwiselab/onos,gkatsikas/onos,kuujo/onos,LorenzReinhart/ONOSnew,kuujo/onos,y-higuchi/onos,sdnwiselab/onos,y-higuchi/onos,oplinkoms/onos,oplinkoms/onos,y-higuchi/onos