Handle changes btw. QoS parms in 1.5 and 1.6

Change-Id: Ife6c68f9ab1d93eb7028c0482cb761350b894ce5
5 files changed