Merge pull request #567 from rizard/master

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

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

...ightcontroller/core/internal/OpenflowPipelineFactory.java

...odlightcontroller/core/web/serializers/OXMSerializer.java

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

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

src/main/resources/floodlightdefault.properties

...htcontroller/core/internal/OFChannelHandlerVer10Test.java

...htcontroller/core/internal/OFChannelHandlerVer13Test.java