Merge "fix incorrect Future usage in (Bundle)FlowForwarder"