Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Do merge these files as soon as freeze is lifted.