Merge "Fix duplicate IMAGE_PROPERTIES env variable in functest run"