Merge "BUG-2571 : implemented (partially) conversion of Flowspec from BI to BA form"