Merge branch 'ps/t1509-chroot-test-fixup'