cruft removal
Merge branch 'master' of github.com:n1ywb/port-agent-antelope