Fix to topology-lldp-discovery to allow for clean karaf feature

Change-Id: Ife3388610a2d816f7bb8e5214cc98d123c4b604b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Merge "Fix to topology-lldp-discovery to allow for clean karaf feature"