Merge pull request #519 from rizard/master

...main/java/net/floodlightcontroller/core/OFConnection.java

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

...dlightcontroller/core/internal/IOFConnectionListener.java

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

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

...a/net/floodlightcontroller/core/internal/RoleManager.java

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

...va/net/floodlightcontroller/core/web/CoreWebRoutable.java

...net/floodlightcontroller/core/web/SwitchRoleResource.java

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

...main/java/net/floodlightcontroller/firewall/Firewall.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

src/main/resources/floodlightdefault.properties

.../java/net/floodlightcontroller/core/OFSwitchBaseTest.java