[tomcatjss/f20] Resolves: rhbz #871171,1058366