Merge pull request #609 from rizard/master

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

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

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

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

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

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