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

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

...n/java/net/floodlightcontroller/core/IOFSwitchDriver.java

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

.../floodlightcontroller/core/annotations/LogMessageDoc.java

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

...floodlightcontroller/core/internal/IOFSwitchFeatures.java

...et/floodlightcontroller/core/internal/OFChannelState.java

.../net/floodlightcontroller/core/internal/OFSwitchImpl.java

...a/net/floodlightcontroller/core/internal/RoleChanger.java

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

...openflow/protocol/statistics/OFDescriptionStatistics.java

.../org/openflow/vendor/nicira/OFNiciraVendorExtensions.java

...et/floodlightcontroller/core/internal/ControllerTest.java

.../floodlightcontroller/core/internal/OFSwitchImplTest.java

...t/floodlightcontroller/core/internal/RoleChangerTest.java

.../floodlightcontroller/util/OFMessageDamperMockSwitch.java