We need the ability to map overlay to underlay flow even when the initia...

...l flow setup message does not reach the collector