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

...floodlightcontroller/core/IFloodlightProviderService.java

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

...t/floodlightcontroller/core/web/SystemUptimeResource.java

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

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

...tcontroller/devicemanager/internal/DeviceUniqueIndex.java

...va/net/floodlightcontroller/routing/IRoutingDecision.java

...ava/net/floodlightcontroller/routing/RoutingDecision.java

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

...troller/devicemanager/internal/DeviceManagerImplTest.java