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

...floodlightcontroller/core/IFloodlightProviderService.java

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

...java/net/floodlightcontroller/core/IOFSwitchListener.java

...floodlightcontroller/core/IReadyForReconcileListener.java

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

...t/floodlightcontroller/core/SwitchSyncRepresentation.java

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

...loodlightcontroller/core/internal/FloodlightProvider.java

.../floodlightcontroller/core/internal/OFChannelHandler.java

...in/java/net/floodlightcontroller/core/util/AppCookie.java

...et/floodlightcontroller/core/util/ListenerDispatcher.java

...floodlightcontroller/core/web/ControllerRoleResource.java

.../java/net/floodlightcontroller/devicemanager/IDevice.java

...va/net/floodlightcontroller/devicemanager/SwitchPort.java

...t/floodlightcontroller/devicemanager/internal/Device.java

...tcontroller/devicemanager/internal/DeviceManagerImpl.java

...n/java/net/floodlightcontroller/flowcache/FCQueryObj.java

...ava/net/floodlightcontroller/flowcache/FRQueryBvsAcl.java

...et/floodlightcontroller/flowcache/FRQueryBvsMatchMac.java

...floodlightcontroller/flowcache/FRQueryBvsMatchSubnet.java