Merge "[RICPLT-2727] Routing Manager - UT fixing"