Remove the "swap port numbers for owamp and bwctl"

This reverts commit c2ecb41db26a747b202e7bbe49e5fd324702f249.