Change message in certain cases

In some cases Puppet error messages are useless.
This patch implements algorithm which makes certain error
messages more userfriendly.

Change-Id: Iac6f1c5382b3c3d605df3477477558858eca69ef
Fixes: rhbz#989334, rhbz#1006476, rhbz#1003959
Merge "Change message in certain cases"
Fixes typo

Change c342c0a60f712103f2c69b14dd5eb3f5b8c0cc93 broke waitforpuppet.
This patch fixing the issue while keeping the can_fail feature

Change-Id: I4408348ca0584ada84cba718d5cdcc1ad769cf18