XD-2408 Fix tap re-deploy issue

   - When a tap is undeployed, the associated tappable module output channel entry was
removed from plugin. We should remove the entry only if the main stream is
undeployed.
      - This way when a tap is re-deployed, the corresponding tap channel
is bound to the module output channel.