Merge branch 'CO-RE relocation selftests fixes'