Fixed matching of flow spec id against flow impl ID.
flow spec may point to FG, and flow impl to feature within FG.
Merge remote-tracking branch 'origin/develop' into develop