Merge remote-tracking branch 'floodlight/master'

...ain/java/net/floodlightcontroller/core/IOFController.java

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

...odlightcontroller/core/module/FloodlightModuleLoader.java

...n/java/net/floodlightcontroller/counter/CounterStore.java

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

.../java/net/floodlightcontroller/forwarding/Forwarding.java

src/main/java/net/floodlightcontroller/packet/Ethernet.java

...oodlightcontroller/staticflowentry/StaticFlowEntries.java

...er/staticflowentry/web/StaticFlowEntryPusherResource.java

...floodlightcontroller/staticflowentry/StaticFlowTests.java