and minor code cleanup
Signed-off-by: Ondrej Nosek onosek@redhat.com
Looks good to me.
rebased onto ff432240809ce13cb79082116ce1b47988c5773b
rebased onto 33bb6a7eba21742c3902c7741732067125a7990b
rebased onto 87fa52a3eba2450e76302a905be492f248c9f1e0
Pull-Request has been merged by onosek
and minor code cleanup
Signed-off-by: Ondrej Nosek onosek@redhat.com