Conflicts:
	bigtest/staticflowpusher/StaticFlowTest1.py

Ok. Let's put the code back in since bigtest is updated now
BSC-2784

This reverts commit 92bfa7a1d71d930f530b8a9cac39c3e6a14a6479.

Cosmetic changes.  Rename varialbe name topology to linkDiscovery, and getTopology to getLinkDiscoveryManager in LinkDiscoveryManagerTest.java.

Merge into master from pull request #1725: Added logging for overload drop, updated parameters  (https://github.com/bigswitch/bigswitchcontroller/pull/1725)

This reverts commit b3cdf7ae81499f1af2274009633f50c971c4d4d5.

floodlight/OFStatisticsMessageBase: add convenience method that returns the first stats-req/reply message dcontained in the body

Merge into master from pull request #1636: Open source stuffff (https://github.com/bigswitch/bigswitchcontroller/pull/1636)

Change getFeaturesReply method to 'query' so it's clear this is an external query, and avoids calling it when serializing to JSON.

* Must not call clearAllFlowMods() on slave -> master transition.
* Hack to solve immediate perf problem on switch handshake: only call
  readSwitchPortStateFromStorage() on role change. Switch handshake
  is now fast again but role change is slow (which is has been before)

BSC-2695
BSC-2727

Bug fix