Merge remote-tracking branch 'origin/master' into bigsynctmp

...va/org/sdnplatform/sync/thrift/AuthChallengeResponse.java

lib/gen-java/org/sdnplatform/sync/thrift/AuthScheme.java

...rg/sdnplatform/sync/thrift/ClusterJoinRequestMessage.java

...g/sdnplatform/sync/thrift/ClusterJoinResponseMessage.java

lib/gen-java/org/sdnplatform/sync/thrift/HelloMessage.java

lib/gen-java/org/sdnplatform/sync/thrift/MessageType.java

lib/gen-java/org/sdnplatform/sync/thrift/Node.java

lib/gen-java/org/sdnplatform/sync/thrift/Scope.java

lib/gen-java/org/sdnplatform/sync/thrift/SyncMessage.java

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

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

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

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

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

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

src/main/java/org/sdnplatform/sync/ISyncService.java

src/main/java/org/sdnplatform/sync/client/AuthTool.java

src/main/java/org/sdnplatform/sync/client/SyncClient.java

src/main/java/org/sdnplatform/sync/error/AuthException.java

...org/sdnplatform/sync/error/InconsistentDataException.java