Undo unwanted changes

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

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

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

...t/floodlightcontroller/storage/AbstractStorageSource.java

...odlightcontroller/storage/memory/MemoryStorageSource.java