Improve conflict message for locked packages (bnc#828631)
changes 9.38.1 (8)