QoS and N4 interoperability branch

Branch provided by @fmessaoudi where he merged his N4 interoperability changes and the changes for QoS in one branch.

We are using this branch for manually testing QoS and provide fixes here.