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

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

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

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

...et/floodlightcontroller/linkdiscovery/ILinkDiscovery.java

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

...htcontroller/linkdiscovery/web/ExternalLinksResource.java

.../floodlightcontroller/linkdiscovery/web/LinkWithType.java

...floodlightcontroller/linkdiscovery/web/LinksResource.java

...n/java/net/floodlightcontroller/util/OFMessageDamper.java

src/main/java/org/openflow/protocol/OFPhysicalPort.java

...a/net/floodlightcontroller/forwarding/ForwardingTest.java

...t/floodlightcontroller/loadbalancer/LoadBalancerTest.java

.../floodlightcontroller/util/OFMessageDamperMockSwitch.java