[releng] Make compatible with Papyrus 6.0Change-Id: I7b5e46ed40e01e157a744db7faffb004218f1ebfSigned-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>