Merge "Fix bgpcep UT aggregation"