Signed-off-by: Tomas Hrcka thrcka@redhat.com
rebased onto 5376861febfec15d401046d55b595cd43d9e2459
rebased onto 34539d1317c41e4b74204be18aab58b9518955ec
Pull-Request has been merged by humaton
Signed-off-by: Tomas Hrcka thrcka@redhat.com