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