Merge remote-tracking branch 'bigswitch/master' into misc

...va/net/floodlightcontroller/core/internal/Controller.java

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

...oodlightcontroller/debugcounter/IDebugCounterService.java

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

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

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

.../java/net/floodlightcontroller/forwarding/Forwarding.java

...java/net/floodlightcontroller/routing/ForwardingBase.java

src/main/java/org/sdnplatform/sync/internal/SyncManager.java