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

...floodlightcontroller/core/IFloodlightProviderService.java

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

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

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

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

...net/floodlightcontroller/core/web/SwitchRoleResource.java

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

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

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

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

.../floodlightcontroller/util/OFMessageDamperMockSwitch.java