Subtree stuff. (https://github.com/floodlight/floodlight/pull/278)

Remove info level log of sending lldp. (https://github.com/floodlight/floodlight/pull/276)

Update for Corrupted device index (https://github.com/floodlight/floodlight/pull/274)

added an attribute (https://github.com/floodlight/floodlight/pull/273)

Fix a posisble NPE in LinkDiscoveryManager.

Fix a posisble NPE in LinkDiscoveryManager. (https://github.com/floodlight/floodlight/pull/272)

Add debug messages for LLDP reschedule.

support property setting to enable/disable flowRecoconcile (https://github.com/floodlight/floodlight/pull/270)

Show openflow clusters by default in REST API, but add a parameter to… 

Add port state as part of Link REST API.

Update the ILinkDiscovery service method to include link and linkinfo to get the link type.

pull request for deleteDevice method (https://github.com/floodlight/floodlight/pull/266)

Fix infite loop in DeviceManager (plus some code cleanup) (https://github.com/floodlight/floodlight/pull/265)

method to delete a device removing all entities, updating secondary map indices first and then delete from devicemap.

BSC-2131

UI: Display flows better (https://github.com/floodlight/floodlight/pull/250)

Schedule/Reschedule discovery task if the controller role is null  or master.  

Bugfix: floodlightProvider.getRole() returns null if the HA role is not enabled.  Discovery task schedule/reschedule should include null as a possible setting for role.

Remove unintended pyc binary files from git repo - No tests necessary

Rechedule discovery task only if role is MASTER.  Also, start the scheduling when role is changed to master.

Link discovery reschedule task is performed only if controller role is MASTER.  Schedule the discovery task when role is changed to master. (https://github.com/floodlight/floodlight/pull/262)

Add input port as additional field for packet hash computation
Auto-merging due to circular dependency with other repo