Merge remote-tracking branch 'bigswitch/bigsync' into bigsync

Conflicts:
	bigfloodlight/src/main/java/com/bigswitch/floodlight/tunnelmanager/TunnelManager.java
	floodlight/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
	floodlight/src/main/java/net/floodlightcontroller/topology/TopologyManager.java