Patches for Two check_hpjd fixes [sf#1216576] [#482]