Merging subtree
Add isOutgoingDiscoveryAllowed(), isIncomingDiscoveryAllowed(), and getDiscoveryActions() as methods to facilitate changes to discovery procedures easily.
Merge pull request #358 from mwfong/producerconsumer

Producer/consumer registration service.
Refactoring of tunnel links/ports, link discovery, forwarding base, and appropriate modifications to unit tests.
Small logical error, allowed me to push infinite rules with the same data layer
Merge pull request #359 from Sovietaced/sovietaced

Floodlight-40-Small logical error, allowed me to push infinite rules with the same dat...
FLOODLIGHT-30 - - Undo the delete by cookie optimization. It is not compatible with all switches.
Merge branch 'master' of github.com:alexreimers/floodlight into backport
Merging subtree
Merge pull request #360 from alexreimers/master

Floodlight-30
Remove non-junit unit test
Merge pull request #361 from kwanggithub/master

retract ProducerConsumer unit test - will redo as junit before adding back
Add helper method that checks if an attribute equals a given object.
Merge remote-tracking branch 'bigswitch/master' into misc

Conflicts:
	bigfloodlight/src/test/java/com/bigswitch/floodlight/tunnelmanager/TunnelManagerPollTest.java

Arrgggh. Only whitespace changed.
Fix tabs
Fix error handling during switch handshake
Add unit test for null sw to RoleChanger
Replace REST calls in load balancer module to use internal static flow pusher calls.
Remove three dependent libraries accordingly.
Merge pull request #362 from kwanggithub/master

Replace REST calls in load balancer module to use internal static flow pusher calls
Merge branch 'backport' of ../bsc/bigswitchcontroller