Revert "Fix cont pointer use to avoid compiler warning;  correct rebasing"

This reverts commit 1426e8e77fd15e13fc791b2e02585df94e3fa8fc.
Revert "Export standard sFlow LAG, PORTNAME and OPENFLOWPORT structures with each"

This reverts commit 3f6d1eae84b9622eaee07765512f44d2e59e8443.
Revert " Prepare ground for extensions to sFlow export. Standard LACP"

This reverts commit c1640de99464db96ce436c79ad8fa5a9e6e2446c.