Integration 2021 wk23
MR !1180 (merged): [CI] nsa traces
MR !1126 (merged): bugfix-nr-t-reordering
MR !1168 (merged): nr-pdcp-small-bugfixes
MR !1180 (merged): [CI] nsa traces
MR !1126 (merged): bugfix-nr-t-reordering
MR !1168 (merged): nr-pdcp-small-bugfixes