Several fixes backported from devel

Addresses 
https://bugzilla.redhat.com/show_bug.cgi?id=1105289
https://bugzilla.redhat.com/show_bug.cgi?id=1105325

and does not start configuration if installation fails