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

...a/net/floodlightcontroller/counter/ConcurrentCounter.java

...in/java/net/floodlightcontroller/counter/CountBuffer.java

...in/java/net/floodlightcontroller/counter/CountSeries.java

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

src/main/java/net/floodlightcontroller/counter/ICounter.java

...et/floodlightcontroller/counter/ICounterStoreService.java

...va/net/floodlightcontroller/counter/NullCounterStore.java

.../java/net/floodlightcontroller/counter/SimpleCounter.java

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

...t/floodlightcontroller/learningswitch/LearningSwitch.java

...main/java/net/floodlightcontroller/packet/BasePacket.java

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

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

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

src/test/java/net/floodlightcontroller/packet/IPv4Test.java