Merge remote-tracking branch 'floodlight/master'

...floodlightcontroller/core/IFloodlightProviderService.java

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

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

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

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

...va/net/floodlightcontroller/core/web/CoreWebRoutable.java

...et/floodlightcontroller/core/web/HealthCheckResource.java

.../java/net/floodlightcontroller/core/web/RoleResource.java

...va/net/floodlightcontroller/restserver/RestApiServer.java

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

...n/java/org/openflow/vendor/nicira/OFNiciraVendorData.java

...ava/org/openflow/vendor/nicira/OFRoleReplyVendorData.java

...a/org/openflow/vendor/nicira/OFRoleRequestVendorData.java

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

...loodlightcontroller/core/test/MockFloodlightProvider.java