Merge branch 'tipc-cleanups-and-simplifications'