Hi Steve,

Could you please check why still these changes are not integrated in kirkstone branch?

These changes are already upstreamed to master. It also got integrated to master.
https://git.yoctoproject.org/poky/commit/?id=22c08cab4db89dc3d41ab22cfe0482c1483391dd

Thanks!
Zahir