Really added the libqdiagsolver conflict (bnc#870683, bnc#866622).

https://bugzilla.novell.com/show_bug.cgi?id=866622#c9