Merge pull request #584 from rizard/master

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

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

...t/floodlightcontroller/core/SwitchSyncRepresentation.java

.../floodlightcontroller/core/internal/OFChannelHandler.java

...ghtcontroller/core/internal/OFSwitchHandshakeHandler.java

...t/floodlightcontroller/core/internal/OFSwitchManager.java

.../floodlightcontroller/core/rest/SwitchRepresentation.java

...floodlightcontroller/core/web/ControllerRoleResource.java

...tcontroller/core/web/serializers/IOFSwitchSerializer.java

...controller/core/web/serializers/StatsReplySerializer.java

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

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

src/main/java/net/floodlightcontroller/util/MatchUtils.java

src/main/java/net/floodlightcontroller/util/OFDPAUtils.java

src/main/resources/floodlightdefault.properties

src/main/resources/logback-test.xml

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

...ightcontroller/core/internal/OFSwitchHandlerTestBase.java

...oodlightcontroller/core/internal/OFSwitchManagerTest.java

.../floodlightcontroller/util/OFMessageDamperMockSwitch.java