Merge branch 'master' of ../bigswitchcontroller into bigsync

src/main/java/net/floodlightcontroller/core/IOFSwitch.java

...main/java/net/floodlightcontroller/core/OFSwitchBase.java

...va/net/floodlightcontroller/core/web/CoreWebRoutable.java

...a/net/floodlightcontroller/debugcounter/DebugCounter.java

...ghtcontroller/debugcounter/DebugCounterResetResource.java

...ghtcontroller/debugcounter/DebugCounterStateResource.java

...oodlightcontroller/debugcounter/IDebugCounterService.java

...t/floodlightcontroller/debugcounter/NullDebugCounter.java

...ightcontroller/debugcounter/web/DebugCounterResource.java

...controller/debugcounter/web/DebugCounterResourceBase.java

...ightcontroller/debugcounter/web/DebugCounterRoutable.java

.../floodlightcontroller/util/OFMessageDamperMockSwitch.java