Merge "Terminaing service table fix in fibmanager"