This patch aligns the current stream to c9s. Resolves: RHEL-19584 Signed-off-by: David Marchand <david.marchand@redhat.com>