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

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

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

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

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

...et/floodlightcontroller/devicemanager/IDeviceService.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

...dlightcontroller/flowcache/FRQueryBvsMatchSwitchPort.java

...et/floodlightcontroller/flowcache/FRQueryBvsMatchTag.java

...t/floodlightcontroller/flowcache/FRQueryBvsMatchVlan.java

...et/floodlightcontroller/flowcache/FRQueryBvsPriority.java

...ghtcontroller/flowcache/FRQueryDevicePropertyChanged.java

...t/floodlightcontroller/flowcache/FRQueryVRSArpChange.java

.../floodlightcontroller/flowcache/FRQueryVRSRuleChange.java

...in/java/net/floodlightcontroller/flowcache/FlowCache.java

.../floodlightcontroller/flowcache/FlowReconcileManager.java