Applied patches

Signed-off-by: Vinzenz Feenstra <vfeenstr@redhat.com>
Fixed installation and scripts

Signed-off-by: Vinzenz Feenstra <vfeenstr@redhat.com>