Merge "Bug 1688: Fix IllegalStateEx from FlowCapableTopologyExporter"