[sr-dev] git:master:380e84d9: Merge pull request #710 from athonet-open/fix_cdp_cleanup