Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync

src/main/java/net/floodlightcontroller/routing/ForwardingBase.java

@@ -570,7 +570,6 @@ public abstract class ForwardingBase
         fm.setCookie(cookie)
           .setHardTimeout(hardTimeout)
           .setIdleTimeout(FLOWMOD_DEFAULT_IDLE_TIMEOUT)
-          .setHardTimeout(FLOWMOD_DEFAULT_HARD_TIMEOUT)
           .setBufferId(OFPacketOut.BUFFER_ID_NONE)
           .setMatch(match)
           .setActions(actions)