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

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

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

...dlightcontroller/core/internal/OFFeaturesReplyFuture.java

.../net/floodlightcontroller/core/internal/OFSwitchImpl.java

...lightcontroller/core/web/AllSwitchStatisticsResource.java

...net/floodlightcontroller/core/web/SwitchResourceBase.java

...oodlightcontroller/core/web/SwitchStatisticsResource.java

...java/net/floodlightcontroller/routing/ForwardingBase.java

...et/floodlightcontroller/core/internal/ControllerTest.java

...a/net/floodlightcontroller/forwarding/ForwardingTest.java

.../floodlightcontroller/util/OFMessageDamperMockSwitch.java